Update of /cvsroot/mahogany/M/src/wx/generic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21844/src/wx/generic
Modified Files:
persctrl.cpp
Log Message:
fixed compilation with WXWIN_COMPATIBILITY_2_4 == 0
Index: persctrl.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/wx/generic/persctrl.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -b -u -2 -r1.93 -r1.94
--- persctrl.cpp 30 Jun 2005 14:22:16 -0000 1.93
+++ persctrl.cpp 24 Nov 2005 13:30:54 -0000 1.94
@@ -117,7 +117,7 @@
static int ConvertId(long rc);
-#if wxCHECK_VERSION(2, 3, 1)
- #define Number() GetCount()
-#endif
+// send a wxCommandEvent of the given type
+static void
+SimulateSelectionEvent(wxControlWithItems *ctrl, wxEventType evtType, int sel);
// ----------------------------------------------------------------------------
@@ -531,5 +531,5 @@
}
- size_t count = (size_t)Number();
+ size_t count = GetCount();
if ( count > m_countSaveMax ) {
// too many entries, leave out the oldest ones
@@ -1048,18 +1048,10 @@
long sel = m_persist->GetConfig()->Read(m_persist->GetKey(), 0l);
- if ( (sel != -1) && (sel < Number()) ) {
+ if ( (sel != -1) && (sel < GetCount()) ) {
SetSelection(sel);
// emulate the event which would have resulted if the user selected
// the listbox
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
- event.m_commandInt = sel;
- if ( HasClientUntypedData() )
- event.m_clientData = GetClientData(sel);
- else if ( HasClientObjectData() )
- event.m_clientData = GetClientObject(sel);
- event.m_commandString = GetString(sel);
- event.SetEventObject( this );
- (void)ProcessEvent(event);
+ SimulateSelectionEvent(this, wxEVT_COMMAND_LISTBOX_SELECTED, sel);
}
@@ -1168,18 +1160,10 @@
long sel = m_persist->GetConfig()->Read(m_persist->GetKey(), 0l);
- if ( (sel != -1) && (sel < Number()) ) {
+ if ( (sel != -1) && (sel < GetCount()) ) {
SetSelection(sel);
// emulate the event which would have resulted if the user selected
// the string from the choice
- wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, GetId());
- event.m_commandInt = sel;
- if ( HasClientUntypedData() )
- event.m_clientData = GetClientData(sel);
- else if ( HasClientObjectData() )
- event.m_clientData = GetClientObject(sel);
- event.m_commandString = GetString(sel);
- event.SetEventObject( this );
- (void)ProcessEvent(event);
+ SimulateSelectionEvent(this, wxEVT_COMMAND_CHOICE_SELECTED, sel);
}
@@ -1294,5 +1278,5 @@
long sel = m_persist->GetConfig()->Read(m_persist->GetKey(), 0l);
- if ( sel < Number() ) {
+ if ( (sel != -1) && (sel < GetCount()) ) {
SetSelection(sel);
@@ -2195,3 +2179,17 @@
}
+static void
+SimulateSelectionEvent(wxControlWithItems *ctrl, wxEventType evtType, int sel)
+{
+ wxCommandEvent event(evtType, ctrl->GetId());
+ event.SetInt(sel);
+ if ( ctrl->HasClientUntypedData() )
+ event.SetClientData(ctrl->GetClientData(sel));
+ else if ( ctrl->HasClientObjectData() )
+ event.SetClientData(ctrl->GetClientObject(sel));
+ event.SetString(ctrl->GetString(sel));
+ event.SetEventObject(ctrl);
+ (void)ctrl->ProcessEvent(event);
+}
+
/* vi: set ts=4 sw=4: */
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
