Updates to fix statusbar and menu errors.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index cd9ebaf89adbca141e845d3d9638e0394d6fc57d..ed2be613806a2d2626be6d43f13b653d6718a846 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -245,7 +245,6 @@ private:
     SWP                             m_vSwpToolBar;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrameOS2)
 };
 
 #endif

diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index 3ef0298525a6559bbd0dfc59377c010f56f53d6a..33ea02be7f00b7ec05c3a1d4c8a182ebc57da658 100644 (file)
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -360,6 +360,11 @@
                                 // needed for wxCanvas
 #define wxUSE_MENUS               1
 
+#define wxUSE_WAVE                1
+
+#define wxUSE_REGEX               1
+
+#define wxUSE_FINDREPLDLG         1 // Find replace dialog
 
 #endif
     // _WX_SETUP_H_

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 3ef0298525a6559bbd0dfc59377c010f56f53d6a..33ea02be7f00b7ec05c3a1d4c8a182ebc57da658 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -360,6 +360,11 @@
                                 // needed for wxCanvas
 #define wxUSE_MENUS               1
 
+#define wxUSE_WAVE                1
+
+#define wxUSE_REGEX               1
+
+#define wxUSE_FINDREPLDLG         1 // Find replace dialog
 
 #endif
     // _WX_SETUP_H_

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index f21c945ae65d5bf4306eaa2cd4eda96dff0edf68..f64008680829526c085212b28d441531455ff427 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -68,10 +68,8 @@ BEGIN_EVENT_TABLE(wxFrameOS2, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrameOS2::OnSysColourChanged)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrameOS2, wxWindow)
-
 #ifndef __WXUNIVERSAL__
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 
 // ============================================================================

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 6dae0cf73468663c43845e79a7130c7f8c526248..c399be08b6ba9e1325b1f5a0531b0ec4a5f3997f 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -104,6 +104,7 @@ GENERICOBJS= \
   ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dragimgg.obj \
   ..\generic\$D\fontdlgg.obj \
+  ..\generic\$D\fdrepdlg.obj \
   ..\generic\$D\grid.obj \
   ..\generic\$D\gridctrl.obj \
   ..\generic\$D\gridsel.obj \
@@ -150,6 +151,7 @@ GENLIBOBJS= \
   dirctrlg.obj \
   dragimgg.obj \
   fontdlgg.obj \
+  fdrepdlg.obj \
   grid.obj \
   gridctrl.obj \
   gridsel.obj \
@@ -190,6 +192,7 @@ NONESSENTIALOBJS= \
 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \
+  ..\common\$D\bmpbase.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
   ..\common\$D\cmdline.obj \
@@ -220,6 +223,7 @@ COMMONOBJS = \
   ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
   ..\common\$D\extended.obj \
+  ..\common\$D\fddlgcmn.obj \
   ..\common\$D\ffile.obj \
   ..\common\$D\file.obj \
   ..\common\$D\fileconf.obj \
@@ -315,6 +319,7 @@ COMMONOBJS = \
 
 COMLIBOBJS1 = \
   appcmn.obj \
+  bmpbase.obj \
   choiccmn.obj \
   clipcmn.obj \
   cmdline.obj \
@@ -342,6 +347,7 @@ COMLIBOBJS1 = \
   encconv.obj \
   event.obj \
   extended.obj \
+  fddlgcmn.obj \
   ffile.obj \
   file.obj \
   fileconf.obj \
@@ -355,11 +361,11 @@ COMLIBOBJS1 = \
   fs_mem.obj \
   fs_zip.obj \
   ftp.obj \
-  gaugecmn.obj \
-  gdicmn.obj \
-  geometry.obj
+  gaugecmn.obj
 
 COMLIBOBJS2 = \
+  gdicmn.obj \
+  geometry.obj \
   gifdecod.obj \
   hash.obj \
   helpbase.obj \
@@ -399,11 +405,11 @@ COMLIBOBJS2 = \
   quantize.obj \
   radiocmn.obj \
   regex.obj \
-  resource.obj \
-  sckaddr.obj \
-  sckfile.obj
+  resource.obj
 
 COMLIBOBJS3 = \
+  sckaddr.obj \
+  sckfile.obj \
   sckipc.obj \
   sckstrm.obj \
   serbase.obj \
@@ -666,6 +672,7 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w
 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
+  copy ..\common\$D\bmpbase.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
   copy ..\common\$D\cmdline.obj
@@ -693,6 +700,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
   copy ..\common\$D\extended.obj
+  copy ..\common\$D\fddlgcmn.obj
   copy ..\common\$D\ffile.obj
   copy ..\common\$D\file.obj
   copy ..\common\$D\fileconf.obj
@@ -707,10 +715,10 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
   copy ..\common\$D\gaugecmn.obj
-  copy ..\common\$D\gdicmn.obj
-  copy ..\common\$D\geometry.obj
 
 $(COMLIBOBJS2):
+  copy ..\common\$D\gdicmn.obj
+  copy ..\common\$D\geometry.obj
   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.obj
   copy ..\common\$D\helpbase.obj
@@ -751,10 +759,10 @@ $(COMLIBOBJS2):
   copy ..\common\$D\radiocmn.obj
   copy ..\common\$D\regex.obj
   copy ..\common\$D\resource.obj
-  copy ..\common\$D\sckaddr.obj
-  copy ..\common\$D\sckfile.obj
 
 $(COMLIBOBJS3):
+  copy ..\common\$D\sckaddr.obj
+  copy ..\common\$D\sckfile.obj
   copy ..\common\$D\sckipc.obj
   copy ..\common\$D\sckstrm.obj
   copy ..\common\$D\serbase.obj
@@ -797,6 +805,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\dcpsg.obj
   copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\fontdlgg.obj
+  copy ..\generic\$D\fdrepdlg.obj
   copy ..\generic\$D\grid.obj
   copy ..\generic\$D\gridctrl.obj
   copy ..\generic\$D\gridsel.obj
@@ -1151,8 +1160,6 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
         erase /N $(COMMDIR)\$D\*.obj
         erase /N $(HTMLDIR)\$D\*.obj
         erase /N $(OS2DIR)\$D\*.obj
-        erase /N $(COMMDIR)\y_tab.c
-        erase /N $(COMMDIR)\lex_yy.c
         rd       $(D)
         rd      ..\generic\$D
         rd      ..\common\$D
@@ -1162,6 +1169,8 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
 !if "$(WXMAKINGDLL)" == "1"
         erase /N ..\..\lib\wx23.lib
 !endif
+        erase /N $(COMMDIR)\y_tab.c
+        erase /N $(COMMDIR)\lex_yy.c
 
 cleanall: clean
 

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 186744bf97d9a5596318a914fe632cd0701a884f..e960818b45d16caef40f1236fc81aebf401ea9bd 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -929,7 +929,6 @@ bool wxMenuBar::Append(
     if (!wxMenuBarBase::Append(pMenu, Title))
         return FALSE;
 
-    pMenu->Attach(this);
     m_titles.Add(Title);
 
     if ( IsAttached() )

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index fbcfcc1029725ada2cdf3a2132028e5b70974d77..2e09d5932c85d53680f7b4e5ff296ea5cda309f9 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -1454,6 +1454,7 @@ void wxWindowOS2::DoMoveWindow(
 , int                               nHeight
 )
 {
+#if 0 // x and y coords should already be in os2 coordinates
     RECTL                           vRect;
     HWND                            hParent;
     wxWindow*                       pParent = GetParent();
@@ -1464,7 +1465,7 @@ void wxWindowOS2::DoMoveWindow(
         hParent = HWND_DESKTOP;
     ::WinQueryWindowRect(hParent, &vRect);
     nY = vRect.yTop - (nY + nHeight);
-
+#endif
     if ( !::WinSetWindowPos( GetHwnd()
                             ,HWND_TOP
                             ,(LONG)nX

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 39801f26006b888012cd4ba2120bb4674da5d373..75703b92d77be5b7353c7e27850eebfb176038ee 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  H:\DEV\WX2\WXWINDOWS\LIB\WX.lib
+;From library:  F:\DEV\WX2\WXWINDOWS\LIB\WX.lib
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
@@ -31,6 +31,7 @@ EXPORTS
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
+  ;From object file:  ..\common\bmpbase.cpp
   ;From object file:  ..\common\choiccmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxChoiceBase::SetStringSelection(const wxString&)
@@ -1615,10 +1616,28 @@ EXPORTS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\extended.c
+  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\extended.c
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
+  ;From object file:  ..\common\fddlgcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxFindDialogEvent::sm_classwxFindDialogEvent
+      sm_classwxFindDialogEvent__17wxFindDialogEvent
+      wxEVT_COMMAND_FIND_REPLACE_ALL
+      wxEVT_COMMAND_FIND_REPLACE
+      wxEVT_COMMAND_FIND_CLOSE
+      ;wxFindReplaceDialogBase::Send(wxFindDialogEvent&)
+      Send__23wxFindReplaceDialogBaseFR17wxFindDialogEvent
+      ;wxFindReplaceData::Init()
+      Init__17wxFindReplaceDataFv
+      ;wxConstructorForwxFindDialogEvent()
+      wxConstructorForwxFindDialogEvent__Fv
+      __vft23wxFindReplaceDialogBase8wxObject
+      wxEVT_COMMAND_FIND_NEXT
+      wxEVT_COMMAND_FIND
+      ;wxFindReplaceDialogBase::~wxFindReplaceDialogBase()
+      __dt__23wxFindReplaceDialogBaseFv
   ;From object file:  ..\common\ffile.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFFile::Seek(long,wxSeekMode)
@@ -5422,7 +5441,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\unzip.c
+  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\unzip.c
     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo
@@ -7119,6 +7138,37 @@ EXPORTS
       PaintFont__19wxGenericFontDialogFR4wxDC
       ;wxGenericFontDialog::sm_classwxGenericFontDialog
       sm_classwxGenericFontDialog__19wxGenericFontDialog
+  ;From object file:  ..\generic\fdrepdlg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxFindReplaceDialog::OnFind(wxCommandEvent&)
+      OnFind__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::OnUpdateFindUI(wxUpdateUIEvent&)
+      OnUpdateFindUI__19wxFindReplaceDialogFR15wxUpdateUIEvent
+      ;wxFindReplaceDialog::OnReplaceAll(wxCommandEvent&)
+      OnReplaceAll__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::sm_classwxFindReplaceDialog
+      sm_classwxFindReplaceDialog__19wxFindReplaceDialog
+      ;wxFindReplaceDialog::sm_eventTable
+      sm_eventTable__19wxFindReplaceDialog
+      __vft19wxFindReplaceDialog8wxObject
+      ;wxConstructorForwxGenericFindReplaceDialog()
+      wxConstructorForwxGenericFindReplaceDialog__Fv
+      ;wxFindReplaceDialog::OnCancel(wxCommandEvent&)
+      OnCancel__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::Create(wxWindow*,wxFindReplaceData*,const wxString&,int)
+      Create__19wxFindReplaceDialogFP8wxWindowP17wxFindReplaceDataRC8wxStringi
+      ;wxFindReplaceDialog::SendEvent(const int&)
+      SendEvent__19wxFindReplaceDialogFRCi
+      ;wxFindReplaceDialog::Init()
+      Init__19wxFindReplaceDialogFv
+      ;wxFindReplaceDialog::sm_eventTableEntries
+      sm_eventTableEntries__19wxFindReplaceDialog
+      ;wxFindReplaceDialog::OnReplace(wxCommandEvent&)
+      OnReplace__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__19wxFindReplaceDialogFR12wxCloseEvent
+      ;wxFindReplaceDialog::GetEventTable() const
+      GetEventTable__19wxFindReplaceDialogCFv
   ;From object file:  ..\generic\grid.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGrid::EnableDragColSize(unsigned long)
@@ -8476,6 +8526,8 @@ EXPORTS
       sm_eventTable__18wxListHeaderWindow
       ;wxListHeaderWindow::sm_eventTableEntries
       sm_eventTableEntries__18wxListHeaderWindow
+      ;wxListView::sm_classwxListView
+      sm_classwxListView__10wxListView
       ;wxListMainWindow::sm_classwxListMainWindow
       sm_classwxListMainWindow__16wxListMainWindow
       ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
@@ -8788,6 +8840,8 @@ EXPORTS
       Add__19wxListLineDataArrayFRC14wxListLineData
       ;wxListCtrl::wxListCtrl()
       __ct__10wxListCtrlFv
+      ;wxConstructorForwxListView()
+      wxConstructorForwxListView__Fv
       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__Fv
       ;wxListTextCtrl::wxListTextCtrl(wxWindow*,const int,unsigned long*,wxString*,wxListMainWindow*,const wxString&,const wxPoint&,const wxSize&,int,const wxValidator&,const wxString&)
@@ -10637,6 +10691,8 @@ EXPORTS
       __as__10wxMsgArrayFRC10wxMsgArray
       ;wxApp::RemoveSocketHandler(int)
       RemoveSocketHandler__5wxAppFi
+      ;wxMsgArray::DoEmpty()
+      DoEmpty__10wxMsgArrayFv
       ;wxYield()
       wxYield__Fv
       wxSTD_FRAME_ICON
@@ -10649,8 +10705,6 @@ EXPORTS
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv
-      ;wxMsgArray::DoEmpty()
-      DoEmpty__10wxMsgArrayFv
       wxFrameClassNameNoRedraw
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
@@ -11902,18 +11956,14 @@ EXPORTS
       Init__10wxFrameOS2Fv
       ;wxFrameOS2::sm_eventTable
       sm_eventTable__10wxFrameOS2
-      ;wxFrameOS2::sm_classwxFrameOS2
-      sm_classwxFrameOS2__10wxFrameOS2
       ;wxFrameOS2::DoGetPosition(int*,int*) const
       DoGetPosition__10wxFrameOS2CFPiT1
-      ;wxConstructorForwxFrameOS2()
-      wxConstructorForwxFrameOS2__Fv
+      ;wxFrameOS2::IsMaximized() const
+      IsMaximized__10wxFrameOS2CFv
       ;wxFrameOS2::SetIcon(const wxIcon&)
       SetIcon__10wxFrameOS2FRC6wxIcon
       ;wxFrameOS2::PositionToolBar()
       PositionToolBar__10wxFrameOS2Fv
-      ;wxFrameOS2::IsMaximized() const
-      IsMaximized__10wxFrameOS2CFv
       ;wxFrameOS2::GetClientAreaOrigin() const
       GetClientAreaOrigin__10wxFrameOS2CFv
       ;wxFrameOS2::OnCreateStatusBar(int,long,int,const wxString&)