Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win16 corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-04-04 11:24:51 +00:00
parent 594542b128
commit 58a33cb4e6
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/prntdlgg.h
View File

@@ -101,15 +101,15 @@ public:
wxDC *GetPrintDC(); wxDC *GetPrintDC();
public: public:
wxStaticText* m_printerMessage; // wxStaticText* m_printerMessage;
wxButton* m_setupButton; wxButton* m_setupButton;
wxButton* m_helpButton; // wxButton* m_helpButton;
wxRadioBox* m_rangeRadioBox; wxRadioBox* m_rangeRadioBox;
wxTextCtrl* m_fromText; wxTextCtrl* m_fromText;
wxTextCtrl* m_toText; wxTextCtrl* m_toText;
wxTextCtrl* m_noCopiesText; wxTextCtrl* m_noCopiesText;
wxCheckBox* m_printToFileCheckBox; wxCheckBox* m_printToFileCheckBox;
wxCheckBox* m_collateCopiesCheckBox; // wxCheckBox* m_collateCopiesCheckBox;
wxPrintDialogData m_printDialogData; wxPrintDialogData m_printDialogData;

5
src/common/cmndata.cpp
View File

@@ -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); GlobalFree(pd->hDevNames);
pd->hDevMode = NULL; pd->hDevMode = NULL;
pd->hDevNames = NULL; pd->hDevNames = NULL;
#ifdef __WXDEBUG__
#if defined(__WXDEBUG__) && defined(__WIN32__)
wxString str("Printing error: "); wxString str("Printing error: ");
str += wxGetPrintDlgError(); str += wxGetPrintDlgError();
wxLogDebug(str); wxLogDebug(str);

2
src/msw/statbmp.cpp
View File

@@ -88,7 +88,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
int winstyle = m_isIcon ? SS_ICON : SS_BITMAP; int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
#else // Win16 #else // Win16
const char *classname = "BUTTON"; const char *classname = "BUTTON";
int winstyle = BS_OWNERDRAWN; int winstyle = BS_OWNERDRAW;
#endif // Win32 #endif // Win32
m_hWnd = (WXHWND)::CreateWindow m_hWnd = (WXHWND)::CreateWindow

16
src/msw/utils.cpp
View File

@@ -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)