Win16 corrections

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

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 9b86b32965e0ca1909b82d4a71ca1b82b95c68dc..24f69980e5ccc17d26f9215d8f4ee3a9904b26cc 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -101,15 +101,15 @@ public:
     wxDC *GetPrintDC();
 
 public:
     wxDC *GetPrintDC();
 
 public:

-    wxStaticText*       m_printerMessage;
+//    wxStaticText*       m_printerMessage;

     wxButton*           m_setupButton;
     wxButton*           m_setupButton;

-    wxButton*           m_helpButton;
+//    wxButton*           m_helpButton;

     wxRadioBox*         m_rangeRadioBox;
     wxTextCtrl*         m_fromText;
     wxTextCtrl*         m_toText;
     wxTextCtrl*         m_noCopiesText;
     wxCheckBox*         m_printToFileCheckBox;
     wxRadioBox*         m_rangeRadioBox;
     wxTextCtrl*         m_fromText;
     wxTextCtrl*         m_toText;
     wxTextCtrl*         m_noCopiesText;
     wxCheckBox*         m_printToFileCheckBox;

-    wxCheckBox*         m_collateCopiesCheckBox;
+//    wxCheckBox*         m_collateCopiesCheckBox;

 
     wxPrintDialogData   m_printDialogData;
 
 
     wxPrintDialogData   m_printDialogData;
 

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index fdb6f88075774d0f79282a413187ca15e6496c8a..ab9bc7b4e275f98fc38acac9625fdba1746b2fef 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -210,7 +210,7 @@ wxPrintData::~wxPrintData()
 #endif
 }
 
 #endif
 }
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && defined(__WIN32__)

 
 static wxString wxGetPrintDlgError()
 {
 
 static wxString wxGetPrintDlgError()
 {


@@ -282,7 +282,8 @@ void wxPrintData::ConvertToNative()
                 GlobalFree(pd->hDevNames);
             pd->hDevMode = NULL;
             pd->hDevNames = NULL;
                 GlobalFree(pd->hDevNames);
             pd->hDevMode = NULL;
             pd->hDevNames = NULL;

-#ifdef __WXDEBUG__
+
+#if defined(__WXDEBUG__) && defined(__WIN32__)

             wxString str("Printing error: ");
             str += wxGetPrintDlgError();
             wxLogDebug(str);
             wxString str("Printing error: ");
             str += wxGetPrintDlgError();
             wxLogDebug(str);

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index e2b9f71daf253210a3794f63611fe8b4d8615b1b..7c5c1397d601d27a3582279b023a8ec684863385 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -88,7 +88,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16
     const char *classname = "BUTTON";
     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16
     const char *classname = "BUTTON";

-    int winstyle = BS_OWNERDRAWN;
+    int winstyle = BS_OWNERDRAW;

 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow
 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 1433988261e79ea1db38e26419a8c8f3a0f57e29..3dc34fdc7e5556f4549575c754c3b6d2dbc6817b 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -301,7 +301,23 @@ static wxTimer *wxTheSleepTimer = NULL;
 
 void wxUsleep(unsigned long milliseconds)
 {
 
 void wxUsleep(unsigned long milliseconds)
 {

+#ifdef __WIN32__

     ::Sleep(milliseconds);
     ::Sleep(milliseconds);

+#else
+  if (inTimer)
+    return;
+
+  wxTheSleepTimer = new wxSleepTimer;
+  inTimer = TRUE;
+  wxTheSleepTimer->Start(milliseconds);
+  while (inTimer)
+  {
+    if (wxTheApp->Pending())
+      wxTheApp->Dispatch();
+  }
+  delete wxTheSleepTimer;
+  wxTheSleepTimer = NULL;
+#endif

 }
 
 void wxSleep(int nSecs)
 }
 
 void wxSleep(int nSecs)