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

Compilation fixes for gcc-3.2.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2003-08-20 17:02:09 +00:00
parent 46674d3538
commit f4e096c56e
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/os2/private.h
View File

@@ -245,7 +245,7 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// The MakeProcInstance version of the function wxSubclassedGenericControlProc // The MakeProcInstance version of the function wxSubclassedGenericControlProc
WXDLLEXPORT_DATA(extern) wxGenericControlSubClassProc; WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc;
WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;

4
src/os2/brush.cpp
View File

@@ -138,7 +138,7 @@ bool wxBrush::RealizeResource()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError); wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError.c_str());
return FALSE; return FALSE;
} }
@@ -220,7 +220,7 @@ bool wxBrush::RealizeResource()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError); wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError.c_str());
} }
return bOk; return bOk;
} }

4
src/os2/dcclient.cpp
View File

@@ -125,7 +125,7 @@ wxWindowDC::wxWindowDC(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Unable to set current color table. Error: %s\n", sError); wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());
} }
::GpiCreateLogColorTable( m_hPS ::GpiCreateLogColorTable( m_hPS
,0L ,0L
@@ -225,7 +225,7 @@ wxClientDC::wxClientDC(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Unable to set current color table. Error: %s\n", sError); wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());
} }
::GpiCreateLogColorTable( m_hPS ::GpiCreateLogColorTable( m_hPS
,0L ,0L

6
src/os2/frame.cpp
View File

@@ -311,7 +311,7 @@ void wxFrame::PositionStatusBar()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error setting parent for StautsBar. Error: %s\n", sError); wxLogError("Error setting parent for StautsBar. Error: %s\n", sError.c_str());
return; return;
} }
} }
@@ -454,14 +454,14 @@ void wxFrame::InternalSetMenuBar()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error setting parent for submenu. Error: %s\n", sError); wxLogError("Error setting parent for submenu. Error: %s\n", sError.c_str());
} }
if (!::WinSetOwner(m_hMenu, m_hFrame)) if (!::WinSetOwner(m_hMenu, m_hFrame))
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error setting parent for submenu. Error: %s\n", sError); wxLogError("Error setting parent for submenu. Error: %s\n", sError.c_str());
} }
::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
} // end of wxFrame::InternalSetMenuBar } // end of wxFrame::InternalSetMenuBar

8
src/os2/menu.cpp
View File

@@ -393,7 +393,7 @@ bool wxMenu::DoInsertOrAppend(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError); wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError.c_str());
wxLogLastError("Insert or AppendMenu"); wxLogLastError("Insert or AppendMenu");
return FALSE; return FALSE;
} }
@@ -828,7 +828,7 @@ WXHMENU wxMenuBar::Create()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error setting parent for submenu. Error: %s\n", sError); wxLogError("Error setting parent for submenu. Error: %s\n", sError.c_str());
return NULLHANDLE; return NULLHANDLE;
} }
@@ -836,7 +836,7 @@ WXHMENU wxMenuBar::Create()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error setting parent for submenu. Error: %s\n", sError); wxLogError("Error setting parent for submenu. Error: %s\n", sError.c_str());
return NULLHANDLE; return NULLHANDLE;
} }
@@ -847,7 +847,7 @@ WXHMENU wxMenuBar::Create()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError); wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError.c_str());
return NULLHANDLE; return NULLHANDLE;
} }
} }

6
src/os2/pen.cpp
View File

@@ -151,7 +151,7 @@ bool wxPen::RealizeResource()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError); wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError.c_str());
return FALSE; return FALSE;
} }
if (M_PENDATA->m_nStyle == wxTRANSPARENT) if (M_PENDATA->m_nStyle == wxTRANSPARENT)
@@ -215,7 +215,7 @@ bool wxPen::RealizeResource()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n", sError); wxLogError("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n", sError.c_str());
return FALSE; return FALSE;
} }
@@ -300,7 +300,7 @@ bool wxPen::RealizeResource()
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError); wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError.c_str());
} }
return bOk; return bOk;
} }

6
src/os2/toplevel.cpp
View File

@@ -501,7 +501,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error creating frame. Error: %s\n", sError); wxLogError("Error creating frame. Error: %s\n", sError.c_str());
return FALSE; return FALSE;
} }
@@ -525,7 +525,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error creating frame. Error: %s\n", sError); wxLogError("Error creating frame. Error: %s\n", sError.c_str());
return FALSE; return FALSE;
} }
@@ -562,7 +562,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error sizing frame. Error: %s\n", sError); wxLogError("Error sizing frame. Error: %s\n", sError.c_str());
return FALSE; return FALSE;
} }
lStyle = ::WinQueryWindowULong( m_hWnd lStyle = ::WinQueryWindowULong( m_hWnd

6
src/os2/window.cpp
View File

@@ -3487,7 +3487,7 @@ bool wxWindowOS2::OS2Create(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Error creating frame. Error: %s\n", sError); wxLogError("Error creating frame. Error: %s\n", sError.c_str());
return FALSE; return FALSE;
} }
SetSize( nX SetSize( nX
@@ -3739,7 +3739,7 @@ bool wxWindowOS2::OS2OnDrawItem(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Unable to set current color table. Error: %s\n", sError); wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());
} }
// //
// Set the color table to RGB mode // Set the color table to RGB mode
@@ -3754,7 +3754,7 @@ bool wxWindowOS2::OS2OnDrawItem(
{ {
vError = ::WinGetLastError(vHabmain); vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError); sError = wxPMErrorToStr(vError);
wxLogError("Unable to set current color table. Error: %s\n", sError); wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());
} }
wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE ); wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );