no message

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

diff --git a/lib/wx214.def b/lib/wx214.def
index a592daf94f4f5b2e1653eba4a9755935c9961c69..ef24d22806263a0f4434f6d5786167f36090392d 100644 (file)
--- a/lib/wx214.def
+++ b/lib/wx214.def
@@ -8710,10 +8710,6 @@ EXPORTS
       CreateHelpWindow__20wxHtmlHelpControllerFv
       ;wxHtmlHelpController::ReadCustomization(wxConfigBase*,const wxString&)
       ReadCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
-      ;wxHtmlHelpController::sm_classwxHtmlHelpController
-      sm_classwxHtmlHelpController__20wxHtmlHelpController
-      ;wxHtmlHelpController::sm_eventTable
-      sm_eventTable__20wxHtmlHelpController
       ;wxHtmlHelpController::WriteCustomization(wxConfigBase*,const wxString&)
       WriteCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
       ;wxHtmlHelpController::UseConfig(wxConfigBase*,const wxString&)
@@ -8722,14 +8718,10 @@ EXPORTS
       wxConstructorForwxHtmlHelpController__Fv
       ;wxHtmlHelpController::~wxHtmlHelpController()
       __dt__20wxHtmlHelpControllerFv
-      ;wxHtmlHelpController::GetEventTable() const
-      GetEventTable__20wxHtmlHelpControllerCFv
       ;wxHtmlHelpController::OnCloseFrame(wxCloseEvent&)
       OnCloseFrame__20wxHtmlHelpControllerFR12wxCloseEvent
       ;wxHtmlHelpController::wxHtmlHelpController(int)
       __ct__20wxHtmlHelpControllerFi
-      ;wxHtmlHelpController::sm_eventTableEntries
-      sm_eventTableEntries__20wxHtmlHelpController
       ;wxHtmlHelpController::SetTitleFormat(const wxString&)
       SetTitleFormat__20wxHtmlHelpControllerFRC8wxString
   ;From object file:  ..\html\helpdata.cpp

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 23a77f120e944dc8e67f3aed144ed3992ab100ee..bf5266858f6d3decfde94e5c4dfaa7285b6ef682 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -362,7 +362,7 @@ bool wxFrame::Show(
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 
         ::WinQueryWindowPos(GetHwnd(), &vSwp);
-        m_bIconized = vSwp & SWP_MINIMIZE;
+        m_bIconized = vSwp.fl & SWP_MINIMIZE;
         ::WinSetWindowPos( (HWND) GetHWND()
                           ,HWND_TOP
                           ,vSwp.x
@@ -384,7 +384,7 @@ bool wxFrame::Show(
             HWND                    hWndParent = GetHwndOf(GetParent());
 
             ::WinQueryWindowPos(hWndParent, &vSwp);
-            m_bIconized = vSwp & SWP_MINIMIZE;
+            m_bIconized = vSwp.fl & SWP_MINIMIZE;
             if (hWndParent)
                 ::WinSetWindowPos( hWndParent
                                   ,HWND_TOP

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 190951eaeda74d3ff6fde533aa8f1d7b3edf1a5c..bbe82e3a5e01390513f6f625f7330a0aff94b90b 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -606,7 +606,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg xpm tiff $(LIBTARGET)
+all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -960,7 +960,7 @@ $(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
-# del *.obj
+ del *.obj
 
 $(WXDIR)\lib\wx.lib: \
   $D\dummy.obj \
@@ -978,14 +978,14 @@ $(WXDIR)\lib\wx.lib: \
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
-# del $(COMTEMPTGT1)
-# del $(COMTEMPTGT2)
-# del $(COMTEMPTGT3)
-# del $(GENTEMPTGT)
-# del $(HTMLTEMPTGT)
-# del $(NONESTEMPTGT)
-# del $(OS2TEMPTGT1)
-# del $(OS2TEMPTGT2)
+ del $(COMTEMPTGT1)
+ del $(COMTEMPTGT2)
+ del $(COMTEMPTGT3)
+ del $(GENTEMPTGT)
+ del $(HTMLTEMPTGT)
+ del $(NONESTEMPTGT)
+ del $(OS2TEMPTGT1)
+ del $(OS2TEMPTGT2)
 
 !else