From 521bf4ff3ef47059265beff5d53c9e1162beb122 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 26 Jan 2006 16:50:23 +0000 Subject: [PATCH] Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/dragimag.cpp | 1 - src/msw/font.cpp | 2 - src/msw/gdiobj.cpp | 4 +- src/msw/gsocket.cpp | 4 +- src/msw/gsockmsw.cpp | 1 - src/msw/mdi.cpp | 1 - src/msw/metafile.cpp | 9 +- src/msw/ole/access.cpp | 13 ++- src/msw/ole/dropsrc.cpp | 7 +- src/msw/ole/droptgt.cpp | 4 +- src/msw/ole/oleutils.cpp | 10 +- src/msw/ole/uuid.cpp | 4 +- src/msw/pen.cpp | 1 - src/msw/penwin.cpp | 6 +- src/msw/statbr95.cpp | 3 +- src/msw/window.cpp | 7 +- src/os2/accel.cpp | 3 +- src/os2/brush.cpp | 1 - src/os2/clipbrd.cpp | 4 - src/os2/cursor.cpp | 3 +- src/os2/font.cpp | 5 +- src/os2/frame.cpp | 1 - src/os2/metafile.cpp | 12 +-- src/os2/palette.cpp | 1 - src/os2/pen.cpp | 13 ++- src/os2/print.cpp | 9 +- src/os2/radiobox.cpp | 13 +-- src/os2/radiobut.cpp | 13 ++- src/os2/timer.cpp | 9 +- src/os2/utilsexc.cpp | 9 +- src/os2/utilsgui.cpp | 57 ++++++------ src/os2/window.cpp | 1 - src/palmos/clipbrd.cpp | 5 - src/palmos/dragimag.cpp | 1 - src/palmos/font.cpp | 2 - src/palmos/gdiobj.cpp | 2 - src/palmos/mdi.cpp | 2 - src/palmos/metafile.cpp | 5 - src/palmos/pen.cpp | 11 +-- src/palmos/statbrpalm.cpp | 8 +- src/palmos/window.cpp | 1 - src/unix/dialup.cpp | 12 +-- src/unix/sound.cpp | 4 +- src/unix/sound_sdl.cpp | 30 +++--- src/x11/dnd.cpp | 67 +++++++------- src/x11/glcanvas.cpp | 186 ++++++++++++++++++++------------------ src/x11/gsockx11.cpp | 11 ++- src/x11/reparent.cpp | 43 +++++---- src/x11/utils.cpp | 44 +++++---- src/x11/window.cpp | 8 +- 50 files changed, 311 insertions(+), 362 deletions(-) diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index 761c33e6a0..396962f92f 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -28,7 +28,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/window.h" #include "wx/dcclient.h" #include "wx/dcscreen.h" diff --git a/src/msw/font.cpp b/src/msw/font.cpp index d335ae6fce..184ce8ba50 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" @@ -1048,4 +1047,3 @@ bool wxFont::IsFixedWidth() const return wxFontBase::IsFixedWidth(); } - diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp index 1e9cc0a3b4..9b7dafc903 100644 --- a/src/msw/gdiobj.cpp +++ b/src/msw/gdiobj.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gdiobj.cpp +// Name: src/msw/gdiobj.cpp // Purpose: wxGDIObject class // Author: Julian Smart // Modified by: @@ -18,7 +18,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" @@ -58,4 +57,3 @@ void wxGDIObject::DecrementResourceUsage(void) }; */ - diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp index ac350bc4ce..42873e0858 100644 --- a/src/msw/gsocket.cpp +++ b/src/msw/gsocket.cpp @@ -1,6 +1,6 @@ /* ------------------------------------------------------------------------- * Project: GSocket (Generic Socket) - * Name: gsocket.cpp + * Name: src/msw/gsocket.cpp * Copyright: (c) Guilhem Lavaux * Licence: wxWindows Licence * Author: Guillermo Rodriguez Garcia @@ -55,7 +55,6 @@ #ifndef __GSOCKET_STANDALONE__ # include "wx/platform.h" -# include "wx/setup.h" #endif #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) @@ -1562,4 +1561,3 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size typedef void (*wxDummy)(); #endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ - diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp index a9fad98e50..7be69eb826 100644 --- a/src/msw/gsockmsw.cpp +++ b/src/msw/gsockmsw.cpp @@ -52,7 +52,6 @@ #ifndef __GSOCKET_STANDALONE__ # include "wx/platform.h" -# include "wx/setup.h" #endif #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index c61e986fa4..9beda728dc 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -27,7 +27,6 @@ #if wxUSE_MDI && !defined(__WXUNIVERSAL__) #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/frame.h" #include "wx/menu.h" #include "wx/app.h" diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp index dfe59cc8f5..3032a5e2cd 100644 --- a/src/msw/metafile.cpp +++ b/src/msw/metafile.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/metafile.cpp +// Name: src/msw/metafile.cpp // Purpose: wxMetafileDC etc. // Author: Julian Smart // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject @@ -24,10 +24,6 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/setup.h" -#endif - #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" @@ -197,7 +193,7 @@ wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i m_minY = 10000; m_maxX = -10000; m_maxY = -10000; - if ( !file.IsEmpty() && wxFileExists(file)) + if ( !file.empty() && wxFileExists(file)) wxRemoveFile(file); m_hDC = (WXHDC) CreateMetaFile(file); @@ -521,4 +517,3 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf) #endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_METAFILE - diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp index b474d73263..c46661c827 100644 --- a/src/msw/ole/access.cpp +++ b/src/msw/ole/access.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/ole/access.cpp +// Name: src/msw/ole/access.cpp // Purpose: implementation of wxIAccessible and wxAccessible // Author: Julian Smart // Modified by: @@ -23,12 +23,11 @@ #if defined(__BORLANDC__) #pragma hdrstop #endif + #ifndef WX_PRECOMP -#include "wx/window.h" + #include "wx/window.h" #endif -#include "wx/setup.h" - #if wxUSE_OLE && wxUSE_ACCESSIBILITY #include "wx/log.h" @@ -962,7 +961,7 @@ STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescrip } else { - if (description.IsEmpty()) + if (description.empty()) { * pszDescription = NULL; return S_FALSE; @@ -1019,7 +1018,7 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp) } else { - if (helpString.IsEmpty()) + if (helpString.empty()) { * pszHelp = NULL; return S_FALSE; @@ -1124,7 +1123,7 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe } else { - if (keyboardShortcut.IsEmpty()) + if (keyboardShortcut.empty()) { * pszKeyboardShortcut = NULL; return S_FALSE; diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp index 7b66b0c350..1b5020da3a 100644 --- a/src/msw/ole/dropsrc.cpp +++ b/src/msw/ole/dropsrc.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/ole/dropsrc.cpp +// Name: src/msw/ole/dropsrc.cpp // Purpose: implementation of wxIDropSource and wxDropSource // Author: Vadim Zeitlin // Modified by: @@ -23,12 +23,11 @@ #if defined(__BORLANDC__) #pragma hdrstop #endif + #ifndef WX_PRECOMP -#include "wx/window.h" + #include "wx/window.h" #endif -#include "wx/setup.h" - #if wxUSE_OLE && wxUSE_DRAG_AND_DROP #include "wx/log.h" diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index 0362766a9f..e3d3791d26 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: ole/droptgt.cpp +// Name: src/msw/ole/droptgt.cpp // Purpose: wxDropTarget implementation // Author: Vadim Zeitlin // Modified by: @@ -24,8 +24,6 @@ #pragma hdrstop #endif -#include "wx/setup.h" - #if wxUSE_OLE && wxUSE_DRAG_AND_DROP #include "wx/msw/private.h" diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 17b768fa2b..8493a938ef 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: ole/oleutils.cpp +// Name: src/msw/ole/oleutils.cpp // Purpose: implementation of OLE helper functions // Author: Vadim Zeitlin // Modified by: @@ -24,7 +24,6 @@ #pragma hdrstop #endif -#include "wx/setup.h" #include "wx/log.h" #if wxUSE_OLE @@ -109,9 +108,9 @@ wxBasicString::wxBasicString(const char *sz) wxBasicString::wxBasicString(const wxString& str) { #if wxUSE_UNICODE - m_wzBuf = new OLECHAR[str.Length() + 1]; - memcpy(m_wzBuf, str.c_str(), str.Length()*2); - m_wzBuf[str.Length()] = L'\0'; + m_wzBuf = new OLECHAR[str.length() + 1]; + memcpy(m_wzBuf, str.c_str(), str.length()*2); + m_wzBuf[str.length()] = L'\0'; #else Init(str.c_str()); #endif @@ -306,4 +305,3 @@ void wxLogRelease(const char *szInterface, ULONG cRef) #endif // wxUSE_OLE - diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp index e34c0931df..06cd373fdd 100644 --- a/src/msw/ole/uuid.cpp +++ b/src/msw/ole/uuid.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: ole/uuid.cpp +// Name: src/msw/ole/uuid.cpp // Purpose: implements Uuid class, see uuid.h for details // Author: Vadim Zeitlin // Modified by: @@ -20,8 +20,6 @@ #pragma hdrstop #endif -#include "wx/setup.h" - #if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) ) // standard headers diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index e3609b79bb..1ddd61e07f 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -18,7 +18,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp index e75a2d701e..2295b2665c 100644 --- a/src/msw/penwin.cpp +++ b/src/msw/penwin.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: penwin.cpp +// Name: src/msw/penwin.cpp // Purpose: PenWindows code // Author: Julian Smart // Modified by: @@ -17,8 +17,7 @@ #endif #ifndef WX_PRECOMP -#include "wx/setup.h" -#include "wx/window.h" + #include "wx/window.h" #endif #include "wx/msw/private.h" @@ -113,4 +112,3 @@ void wxCleanUpPenWin(void) } #endif } - diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 4cf594a898..2fbcb7fe52 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -17,7 +17,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/frame.h" #include "wx/settings.h" #include "wx/dcclient.h" @@ -307,7 +306,7 @@ void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height) // if other windows are size deferred ::SetWindowPos(GetHwnd(), NULL, x, y, width, height, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE -#ifndef __WXWINCE__ +#ifndef __WXWINCE__ | SWP_NOCOPYBITS | SWP_NOSENDCHANGING #endif ); diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 6bd5ca66fb..286039c640 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -28,7 +28,6 @@ #include "wx/msw/wrapwin.h" #include "wx/window.h" #include "wx/accel.h" - #include "wx/setup.h" #include "wx/menu.h" #include "wx/dc.h" #include "wx/dcclient.h" @@ -941,7 +940,7 @@ void wxWindowMSW::SetScrollbar(int orient, // We have to set the variables here to make them valid in events // triggered by ::SetScrollInfo() *(orient == wxHORIZONTAL ? &m_xThumbSize : &m_yThumbSize) = pageSize; - + ::SetScrollInfo(hWnd, orient == wxHORIZONTAL ? SB_HORZ : SB_VERT, &info, refresh); } @@ -1095,8 +1094,8 @@ bool wxCheckWindowWndProc(WXHWND hWnd, // TODO: This list of window class names should be factored out so they can be // managed in one place and then accessed from here and other places, such as // wxApp::RegisterWindowClasses() and wxApp::UnregisterWindowClasses() - -#ifdef __WXWINCE__ + +#ifdef __WXWINCE__ extern wxChar *wxCanvasClassName; extern wxChar *wxCanvasClassNameNR; #else diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp index 34be764815..bcc71c83db 100644 --- a/src/os2/accel.cpp +++ b/src/os2/accel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: accel.cpp +// Name: src/os2/accel.cpp // Purpose: wxAcceleratorTable // Author: David Webster // Modified by: @@ -14,7 +14,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/window.h" #include "wx/app.h" #include "wx/frame.h" diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp index eeb6af0c86..defdde2797 100644 --- a/src/os2/brush.cpp +++ b/src/os2/brush.cpp @@ -14,7 +14,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp index e2c6f65912..a3691d7e0f 100644 --- a/src/os2/clipbrd.cpp +++ b/src/os2/clipbrd.cpp @@ -12,10 +12,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifndef WX_PRECOMP - #include "wx/setup.h" -#endif - #if wxUSE_CLIPBOARD #ifndef WX_PRECOMP diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp index 92adc678b7..2bb61ca264 100644 --- a/src/os2/cursor.cpp +++ b/src/os2/cursor.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.cpp +// Name: src/os2/cursor.cpp // Purpose: wxCursor class // Author: David Webster // Modified by: @@ -14,7 +14,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" diff --git a/src/os2/font.cpp b/src/os2/font.cpp index ff695a16d0..18dcce67b7 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: src/os2/font.cpp // Purpose: wxFont class // Author: David Webster // Modified by: @@ -22,7 +22,6 @@ #ifndef WX_PRECOMP #include - #include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" @@ -1115,7 +1114,7 @@ bool wxFont::GetUnderlined() const wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") ); + wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->GetFaceName(); } // end of wxFont::GetFaceName diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index 806839fdc9..e7b33f7829 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -22,7 +22,6 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/event.h" - #include "wx/setup.h" #include "wx/frame.h" #include "wx/menu.h" #include "wx/app.h" diff --git a/src/os2/metafile.cpp b/src/os2/metafile.cpp index cb3d8541db..b2b402c794 100644 --- a/src/os2/metafile.cpp +++ b/src/os2/metafile.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: metafile.cpp +// Name: src/os2/metafile.cpp // Purpose: wxMetaFile, wxMetaFileDC etc. These classes are optional. // Author: David Webster // Modified by: @@ -12,10 +12,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifndef WX_PRECOMP -#include "wx/setup.h" -#endif - #if wxUSE_METAFILE #ifndef WX_PRECOMP @@ -62,7 +58,7 @@ wxMetafile::wxMetafile(const wxString& file) M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC; M_METAFILEDATA->m_metafile = 0; - if (!file.IsNull() && (file.Cmp(wxT("")) == 0)) + if (!file.empty()) M_METAFILEDATA->m_metafile = (WXHANDLE)0; // TODO: GetMetaFile(file); } @@ -144,7 +140,7 @@ wxMetafileDC::wxMetafileDC(const wxString& file) // TODO /* - if (!file.IsNull() && (file != wxT(""))) + if (!file.empty()) m_hDC = (WXHDC) CreateMetaFile(file); else m_hDC = (WXHDC) CreateMetaFile(NULL); @@ -170,7 +166,7 @@ wxMetafileDC::wxMetafileDC( const wxString& file, m_minY = 10000; m_maxX = -10000; m_maxY = -10000; - if (file != wxT("") && wxFileExists(file)) + if (!file.empty() && wxFileExists(file)) wxRemoveFile(file); // m_hDC = (WXHDC) CreateMetaFile(file); diff --git a/src/os2/palette.cpp b/src/os2/palette.cpp index b28c4307d2..76e68ed2f0 100644 --- a/src/os2/palette.cpp +++ b/src/os2/palette.cpp @@ -15,7 +15,6 @@ #ifndef WX_PRECOMP #include #include "wx/defs.h" -#include "wx/setup.h" #include "wx/string.h" #include "wx/os2/private.h" #include "wx/palette.h" diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index 91efcb3ab3..dc85074fd9 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -13,13 +13,12 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/pen.h" -#include "wx/log.h" + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/pen.h" + #include "wx/log.h" #endif #include "wx/os2/private.h" diff --git a/src/os2/print.cpp b/src/os2/print.cpp index 99050676ed..dd82cee220 100644 --- a/src/os2/print.cpp +++ b/src/os2/print.cpp @@ -12,11 +12,10 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" #endif #if wxUSE_PRINTING_ARCHITECTURE diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp index 3b93efcba8..fa60f8f8de 100644 --- a/src/os2/radiobox.cpp +++ b/src/os2/radiobox.cpp @@ -14,7 +14,6 @@ #ifndef WX_PRECOMP #include - #include "wx/setup.h" #include "wx/wxchar.h" #include "wx/string.h" #include "wx/bitmap.h" @@ -86,7 +85,7 @@ wxRadioBox::~wxRadioBox() wxRemoveHandleAssociation(pWin); ::WinDestroyWindow((HWND)m_ahRadioButtons[i]); - } + } delete[] m_ahRadioButtons; } if (m_pnRadioWidth) @@ -620,11 +619,9 @@ void wxRadioBox::GetSize( int* pnWidth, int* pnHeight ) const } // end of wxRadioBox::GetSize // Find string for position -wxString wxRadioBox::GetString( - int nNum -) const +wxString wxRadioBox::GetString( int nNum ) const { - wxCHECK_MSG( IsValid(nNum), wxString(""), wxT("invalid radiobox index") ); + wxCHECK_MSG( IsValid(nNum), wxEmptyString, wxT("invalid radiobox index") ); return wxGetWindowText(m_ahRadioButtons[nNum]); } // end of wxRadioBox::GetString @@ -655,8 +652,8 @@ wxSize wxRadioBox::GetTotalButtonSize( const wxSize& rSizeBtn ) const // // And also wide enough for its label // - wxString sStr = wxGetWindowText(GetHwnd()); - if (!sStr.IsEmpty()) + wxString sStr = wxGetWindowText(GetHwnd()); + if (!sStr.empty()) { GetTextExtent( sStr ,&nWidthLabel diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp index 7134de72b4..6d6376cde7 100644 --- a/src/os2/radiobut.cpp +++ b/src/os2/radiobut.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobut.cpp +// Name: src/os2/radiobut.cpp // Purpose: wxRadioButton // Author: David Webster // Modified by: @@ -17,12 +17,11 @@ #endif #ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/radiobut.h" -#include "wx/brush.h" -#include "wx/dcscreen.h" -#include "wx/settings.h" + #include + #include "wx/radiobut.h" + #include "wx/brush.h" + #include "wx/dcscreen.h" + #include "wx/settings.h" #endif #include "wx/os2/private.h" diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp index cb2d9518cc..8c322fbb38 100644 --- a/src/os2/timer.cpp +++ b/src/os2/timer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.cpp +// Name: src/os2/timer.cpp // Purpose: wxTimer implementation // Author: David Webster // Modified by: @@ -12,16 +12,14 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/window.h" -#include "wx/os2/private.h" - #ifndef WX_PRECOMP - #include "wx/setup.h" + #include "wx/window.h" #include "wx/list.h" #include "wx/event.h" #include "wx/app.h" #endif +#include "wx/os2/private.h" #include "wx/intl.h" #include "wx/log.h" @@ -206,4 +204,3 @@ ULONG wxTimerProc( wxProcessTimer(*(node->second)); return 0; } - diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp index 20d73e6f90..21b50548e2 100644 --- a/src/os2/utilsexc.cpp +++ b/src/os2/utilsexc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utilsexec.cpp +// Name: src/os2/utilsexec.cpp // Purpose: Various utilities // Author: David Webster // Modified by: @@ -13,10 +13,9 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include "wx/setup.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/intl.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/intl.h" #endif #include "wx/log.h" diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp index 5b7e06cf34..66647fcd2e 100644 --- a/src/os2/utilsgui.cpp +++ b/src/os2/utilsgui.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: os2/utilsgui.cpp +// Name: src/os2/utilsgui.cpp // Purpose: Various utility functions only available in GUI // Author: David Webster // Modified by: @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/utils.h" #include "wx/app.h" #include "wx/cursor.h" @@ -69,7 +68,7 @@ bool wxWriteResource( HAB hab = 0; HINI hIni = 0; - if (rFile != "") + if (!rFile.empty()) { hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile); if (hIni != 0L) @@ -153,7 +152,7 @@ bool wxGetResource( wxChar zDefunkt[] = _T("$$default"); char zBuf[1000]; - if (rFile != "") + if (!rFile.empty()) { hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile); if (hIni != 0L) @@ -484,7 +483,7 @@ void wxGUIAppTraits::TerminateGui(unsigned long ulHab) wxToolkitInfo & wxGUIAppTraits::GetToolkitInfo() { - static wxToolkitInfo vInfo; + static wxToolkitInfo vInfo; ULONG ulSysInfo[QSV_MAX] = {0}; APIRET ulrc; @@ -512,44 +511,40 @@ wxToolkitInfo & wxGUIAppTraits::GetToolkitInfo() // window information functions // --------------------------------------------------------------------------- -wxString WXDLLEXPORT wxGetWindowText( - WXHWND hWnd -) +wxString WXDLLEXPORT wxGetWindowText( WXHWND hWnd ) { - wxString vStr; + wxString vStr; if ( hWnd ) { - long lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1; - ::WinQueryWindowText((HWND)hWnd, lLen, (PSZ)(wxChar*)wxStringBuffer(vStr, lLen)); + long lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1; + ::WinQueryWindowText((HWND)hWnd, lLen, (PSZ)(wxChar*)wxStringBuffer(vStr, lLen)); } return vStr; } -wxString WXDLLEXPORT wxGetWindowClass( - WXHWND hWnd -) +wxString WXDLLEXPORT wxGetWindowClass( WXHWND hWnd ) { - wxString vStr; + wxString vStr; if ( hWnd ) { - int nLen = 256; // some starting value - - for ( ;; ) - { - int nCount = ::WinQueryClassName((HWND)hWnd, nLen, (PSZ)(wxChar*)wxStringBuffer(vStr, nLen)); - - if (nCount == nLen ) - { - // the class name might have been truncated, retry with larger - // buffer - nLen *= 2; - } - else - { - break; - } + int nLen = 256; // some starting value + + for ( ;; ) + { + int nCount = ::WinQueryClassName((HWND)hWnd, nLen, (PSZ)(wxChar*)wxStringBuffer(vStr, nLen)); + + if (nCount == nLen ) + { + // the class name might have been truncated, retry with larger + // buffer + nLen *= 2; + } + else + { + break; + } } } return vStr; diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 24d5f26679..e504c87e52 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -20,7 +20,6 @@ #include #include "wx/window.h" #include "wx/accel.h" - #include "wx/setup.h" #include "wx/menu.h" #include "wx/dc.h" #include "wx/dcclient.h" diff --git a/src/palmos/clipbrd.cpp b/src/palmos/clipbrd.cpp index 8a7cec2604..8cc26b6813 100644 --- a/src/palmos/clipbrd.cpp +++ b/src/palmos/clipbrd.cpp @@ -24,10 +24,6 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/setup.h" -#endif - #if wxUSE_CLIPBOARD #ifndef WX_PRECOMP @@ -203,4 +199,3 @@ bool wxClipboard::GetData( wxDataObject& data ) } #endif // wxUSE_CLIPBOARD - diff --git a/src/palmos/dragimag.cpp b/src/palmos/dragimag.cpp index 782c168db5..4b6275a500 100644 --- a/src/palmos/dragimag.cpp +++ b/src/palmos/dragimag.cpp @@ -28,7 +28,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/window.h" #include "wx/dcclient.h" #include "wx/dcscreen.h" diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp index b3f9954ddc..d75397c30e 100644 --- a/src/palmos/font.cpp +++ b/src/palmos/font.cpp @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" @@ -523,4 +522,3 @@ bool wxFont::IsFixedWidth() const { return false; } - diff --git a/src/palmos/gdiobj.cpp b/src/palmos/gdiobj.cpp index fac824cd3a..671c081154 100644 --- a/src/palmos/gdiobj.cpp +++ b/src/palmos/gdiobj.cpp @@ -18,7 +18,6 @@ #ifndef WX_PRECOMP #include -#include "wx/setup.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" @@ -38,4 +37,3 @@ void wxGDIObject::DecrementResourceUsage(void) }; */ - diff --git a/src/palmos/mdi.cpp b/src/palmos/mdi.cpp index cb49624b29..247c714c41 100644 --- a/src/palmos/mdi.cpp +++ b/src/palmos/mdi.cpp @@ -27,7 +27,6 @@ #if wxUSE_MDI && !defined(__WXUNIVERSAL__) #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/frame.h" #include "wx/menu.h" #include "wx/app.h" @@ -407,4 +406,3 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, } #endif // wxUSE_MDI && !defined(__WXUNIVERSAL__) - diff --git a/src/palmos/metafile.cpp b/src/palmos/metafile.cpp index 67497d22e2..5c6880d9b9 100644 --- a/src/palmos/metafile.cpp +++ b/src/palmos/metafile.cpp @@ -24,10 +24,6 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/setup.h" -#endif - #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" @@ -190,4 +186,3 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf) #endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_METAFILE - diff --git a/src/palmos/pen.cpp b/src/palmos/pen.cpp index 7d63a301d5..1290ab10ae 100644 --- a/src/palmos/pen.cpp +++ b/src/palmos/pen.cpp @@ -17,12 +17,11 @@ #endif #ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/pen.h" + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/pen.h" #endif static int wx2msPenStyle(int wx_style); diff --git a/src/palmos/statbrpalm.cpp b/src/palmos/statbrpalm.cpp index d1571c7d8d..149ac43fa0 100644 --- a/src/palmos/statbrpalm.cpp +++ b/src/palmos/statbrpalm.cpp @@ -17,10 +17,9 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" - #include "wx/frame.h" - #include "wx/settings.h" - #include "wx/dcclient.h" + #include "wx/frame.h" + #include "wx/settings.h" + #include "wx/dcclient.h" #endif #if wxUSE_NATIVE_STATUSBAR @@ -269,4 +268,3 @@ void wxStatusBarPalm::DoMoveWindow(int x, int y, int width, int height) } #endif // wxUSE_NATIVE_STATUSBAR - diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp index 9384915c44..fb7272487a 100644 --- a/src/palmos/window.cpp +++ b/src/palmos/window.cpp @@ -27,7 +27,6 @@ #ifndef WX_PRECOMP #include "wx/window.h" #include "wx/accel.h" - #include "wx/setup.h" #include "wx/menu.h" #include "wx/dc.h" #include "wx/dcclient.h" diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 3f96dfba46..e9d916a062 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -1,5 +1,5 @@ // -*- c++ -*- //////////////////////////////////////////////////////////////// -// Name: unix/dialup.cpp +// Name: src/unix/dialup.cpp // Purpose: Network related wxWidgets classes and functions // Author: Karsten Ballüder // Modified by: @@ -12,8 +12,6 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if wxUSE_DIALUP_MANAGER #ifndef WX_PRECOMP @@ -400,7 +398,7 @@ void wxDialUpManagerImpl::DisableAutoCheckOnlineStatus() void wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno) { - if(hostname.Length() == 0) + if(hostname.length() == 0) { m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST; m_BeaconPort = 80; @@ -409,7 +407,7 @@ void wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno) // does hostname contain a port number? wxString port = hostname.After(wxT(':')); - if(port.Length()) + if(port.length()) { m_BeaconHost = hostname.Before(wxT(':')); m_BeaconPort = wxAtoi(port); @@ -766,9 +764,9 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing() if (wxFileExists( wxT("SYS$SYSTEM:TCPIP$PING.EXE") )) m_PingPath = wxT("$SYS$SYSTEM:TCPIP$PING"); #elif defined(__AIX__) - m_PingPath = _T("/etc/ping"); + m_PingPath = _T("/etc/ping"); #elif defined(__SGI__) - m_PingPath = _T("/usr/etc/ping"); + m_PingPath = _T("/usr/etc/ping"); #else if (wxFileExists( wxT("/bin/ping") )) m_PingPath = wxT("/bin/ping"); diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp index fbd9802383..6afa44f146 100644 --- a/src/unix/sound.cpp +++ b/src/unix/sound.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sound.cpp +// Name: src/unix/sound.cpp // Purpose: wxSound // Author: Marcel Rasche, Vaclav Slavik // Modified by: @@ -12,8 +12,6 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if defined(__BORLANDC__) #pragma hdrstop #endif diff --git a/src/unix/sound_sdl.cpp b/src/unix/sound_sdl.cpp index 12edf71953..4858a0f282 100644 --- a/src/unix/sound_sdl.cpp +++ b/src/unix/sound_sdl.cpp @@ -1,19 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sound_sdl.cpp +// Name: src/unix/sound_sdl.cpp // Purpose: wxSound backend using SDL // Author: Vaclav Slavik // Modified by: // Created: 2004/01/31 // RCS-ID: $Id$ // Copyright: (c) 2004, Open Source Applications Foundation -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if defined(__BORLANDC__) #pragma hdrstop #endif @@ -42,7 +40,7 @@ class wxSoundBackendSDLNotification : public wxEvent public: DECLARE_DYNAMIC_CLASS(wxSoundBackendSDLNotification) wxSoundBackendSDLNotification(); - wxEvent *Clone() const { return new wxSoundBackendSDLNotification(*this); } + wxEvent *Clone() const { return new wxSoundBackendSDLNotification(*this); } }; typedef void (wxEvtHandler::*wxSoundBackendSDLNotificationFunction) @@ -72,11 +70,11 @@ class wxSoundBackendSDLEvtHandler; class wxSoundBackendSDL : public wxSoundBackend { public: - wxSoundBackendSDL() + wxSoundBackendSDL() : m_initialized(false), m_playing(false), m_audioOpen(false), m_data(NULL), m_evtHandler(NULL) {} virtual ~wxSoundBackendSDL(); - + wxString GetName() const { return _T("Simple DirectMedia Layer"); } int GetPriority() const { return 9; } bool IsAvailable() const; @@ -86,14 +84,14 @@ public: void FillAudioBuffer(Uint8 *stream, int len); void FinishedPlayback(); - + void Stop(); bool IsPlaying() const { return m_playing; } - + private: bool OpenAudio(); void CloseAudio(); - + bool m_initialized; bool m_playing, m_audioOpen; // playback information: @@ -205,19 +203,19 @@ bool wxSoundBackendSDL::OpenAudio() { if (!m_evtHandler) m_evtHandler = new wxSoundBackendSDLEvtHandler(this); - + m_spec.silence = 0; m_spec.samples = 4096; m_spec.size = 0; m_spec.callback = wx_sdl_audio_callback; m_spec.userdata = (void*)this; - + wxLogTrace(_T("sound"), _T("opening SDL audio...")); if (SDL_OpenAudio(&m_spec, NULL) >= 0) { #if wxUSE_LOG_DEBUG char driver[256]; - SDL_AudioDriverName(driver, 256); + SDL_AudioDriverName(driver, 256); wxLogTrace(_T("sound"), _T("opened audio, driver '%s'"), wxString(driver, wxConvLocal).c_str()); #endif @@ -248,7 +246,7 @@ bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags, volatile wxSoundPlaybackStatus *WXUNUSED(status)) { Stop(); - + int format; if (data->m_bitsPerSample == 8) format = AUDIO_U8; @@ -271,7 +269,7 @@ bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags, CloseAudio(); } } - + if (needsOpen) { m_spec.format = format; @@ -280,7 +278,7 @@ bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags, if (!OpenAudio()) return false; } - + SDL_LockAudio(); wxLogTrace(_T("sound"), _T("playing new sound")); m_playing = true; diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp index 798af946bd..0e39009af8 100644 --- a/src/x11/dnd.cpp +++ b/src/x11/dnd.cpp @@ -1,13 +1,18 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/x11/dnd.cpp // Purpose: wxDropTarget, wxDropSource classes // Author: Julian Smart // Id: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if defined(__BORLANDC__) +#pragma hdrstop +#endif #if wxUSE_DRAG_AND_DROP @@ -44,14 +49,14 @@ wxDropTarget::~wxDropTarget() bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) { OnDropText( x, y, (const char*)data ); - return TRUE; + return true; } bool wxTextDropTarget::OnDropText( long x, long y, const char *psz ) { wxLogDebug( "Got dropped text: %s.", psz ); wxLogDebug( "At x: %d, y: %d.", (int)x, (int)y ); - return TRUE; + return true; } size_t wxTextDropTarget::GetFormatCount() const @@ -77,7 +82,7 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * { wxLogDebug( aszFiles[i] ); } - return TRUE; + return true; } bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) @@ -88,10 +93,10 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) for (i = 0; i < size; i++) if (text[i] == 0) number++; - if (number == 0) return TRUE; - + if (number == 0) return true; + char **files = new char*[number]; - + text = (char*) data; for ( i = 0; i < number; i++) { @@ -100,10 +105,10 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) text += len+1; } - bool ret = OnDropFiles( x, y, 1, files ); - + bool ret = OnDropFiles( x, y, 1, files ); + free( files ); - + return ret; } @@ -136,13 +141,13 @@ wxDropSource::wxDropSource( wxWindow *win ) wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win ) { #if 0 - g_blockEventsOnDrag = TRUE; - + g_blockEventsOnDrag = true; + m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; m_retValue = wxDragCancel; - + m_data = &data; m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); @@ -159,7 +164,7 @@ wxDropSource::~wxDropSource(void) { // if (m_data) delete m_data; } - + wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) ) { // wxASSERT_MSG( m_data, "wxDragSource: no data" ); @@ -168,15 +173,15 @@ wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) ) #if 0 if (!m_data) return (wxDragResult) wxDragNone; if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone; - + RegisterWindow(); - + // TODO - + UnregisterWindow(); - + g_blockEventsOnDrag = FALSE; - + return m_retValue; #endif } @@ -187,30 +192,30 @@ void wxDropSource::RegisterWindow(void) if (!m_data) return; wxString formats; - + wxDataFormat df = m_data->GetPreferredFormat(); - - switch (df) + + switch (df) { - case wxDF_TEXT: + case wxDF_TEXT: formats += "text/plain"; - break; + break; case wxDF_FILENAME: formats += "file:ALL"; - break; + break; default: break; } - + char *str = WXSTRINGCAST formats; - + // TODO } void wxDropSource::UnregisterWindow(void) { if (!m_widget) return; - + // TODO } #endif @@ -219,7 +224,7 @@ wxPrivateDropTarget::wxPrivateDropTarget() { m_id = wxTheApp->GetAppName(); } - + size_t wxPrivateDropTarget::GetFormatCount() const { return 1; diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp index 11eda0cfe5..9ab1474b9c 100644 --- a/src/x11/glcanvas.cpp +++ b/src/x11/glcanvas.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: glcanvas.cpp +// Name: src/x11/glcanvas.cpp // Purpose: wxGLCanvas, for using OpenGL with wxWidgets // Uses the GLX extension. // Author: Julian Smart and Wolfram Gloger @@ -7,10 +7,15 @@ // Created: 1995, 1999 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Wolfram Gloger -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if defined(__BORLANDC__) +#pragma hdrstop +#endif #if wxUSE_GLCANVAS @@ -46,9 +51,10 @@ static inline WXWindow wxGetClientAreaWindow(wxWindow* win) static int bitcount( unsigned long n ) { int bits; - for (bits=0; n>0;) { - if(n & 1) bits++; - n = n >> 1; + for (bits=0; n>0;) + { + if(n & 1) bits++; + n = n >> 1; } return bits; } @@ -60,7 +66,7 @@ static int bitcount( unsigned long n ) IMPLEMENT_CLASS(wxGLContext,wxObject) -wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, +wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& WXUNUSED(palette) ) { m_window = win; @@ -68,17 +74,17 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, wxGLCanvas *gc = (wxGLCanvas*) win; XVisualInfo *vi = (XVisualInfo *) gc->m_vi; - + wxCHECK_RET( vi, wxT("invalid visual for OpenGL") ); - + m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, None, GL_TRUE); - + wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGL context") ); } -wxGLContext::wxGLContext( - bool WXUNUSED(isRGB), wxWindow *win, +wxGLContext::wxGLContext( + bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ) @@ -88,28 +94,28 @@ wxGLContext::wxGLContext( wxGLCanvas *gc = (wxGLCanvas*) win; XVisualInfo *vi = (XVisualInfo *) gc->m_vi; - + wxCHECK_RET( vi, wxT("invalid visual for OpenGL") ); - + if( other != 0 ) - m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, + m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, other->m_glContext, GL_TRUE ); else m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, None, GL_TRUE ); - + wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGL context") ); } wxGLContext::~wxGLContext() { if (!m_glContext) return; - + if (m_glContext == glXGetCurrentContext()) { glXMakeCurrent( (Display*) wxGetDisplay(), None, NULL); } - + glXDestroyContext( (Display*) wxGetDisplay(), m_glContext ); } @@ -124,10 +130,10 @@ void wxGLContext::SwapBuffers() void wxGLContext::SetCurrent() { - if (m_glContext) - { + if (m_glContext) + { Display* display = (Display*) wxGetDisplay(); - glXMakeCurrent(display, (Window) wxGetClientAreaWindow(m_window), + glXMakeCurrent(display, (Window) wxGetClientAreaWindow(m_window), m_glContext ); } } @@ -191,36 +197,36 @@ END_EVENT_TABLE() wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name, - int *attribList, - const wxPalette& palette ) + const wxPoint& pos, const wxSize& size, + long style, const wxString& name, + int *attribList, + const wxPalette& palette ) : wxScrolledWindow(parent, id, pos, size, style, name) { Create( parent, NULL, NULL, id, pos, size, style, name, attribList, palette ); } -wxGLCanvas::wxGLCanvas( wxWindow *parent, +wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name, - int *attribList, - const wxPalette& palette ) + const wxPoint& pos, const wxSize& size, + long style, const wxString& name, + int *attribList, + const wxPalette& palette ) : wxScrolledWindow(parent, id, pos, size, style, name) -{ +{ Create( parent, shared, NULL, id, pos, size, style, name, attribList, palette ); } -wxGLCanvas::wxGLCanvas( wxWindow *parent, +wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name, - int *attribList, - const wxPalette& palette ) + const wxPoint& pos, const wxSize& size, + long style, const wxString& name, + int *attribList, + const wxPalette& palette ) : wxScrolledWindow(parent, id, pos, size, style, name) -{ +{ Create( parent, NULL, shared, id, pos, size, style, name, attribList, palette ); } @@ -229,19 +235,19 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, const wxGLCanvas *shared_context_of, wxWindowID id = -1, const wxPoint& pos, - const wxSize& size, long style, + const wxSize& size, long style, const wxString& name, int *attribList, const wxPalette& palette): wxScrolledWindow(parent, id, pos, size, style, name) */ -bool wxGLCanvas::Create( wxWindow *parent, +bool wxGLCanvas::Create( wxWindow *parent, const wxGLContext *shared, const wxGLCanvas *shared_context_of, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name, - int *attribList, - const wxPalette& palette) + const wxPoint& pos, const wxSize& size, + long style, const wxString& name, + int *attribList, + const wxPalette& palette) { XVisualInfo *vi, vi_templ; XWindowAttributes xwa; @@ -254,14 +260,15 @@ bool wxGLCanvas::Create( wxWindow *parent, Display* display = (Display*) wxGetDisplay(); // Check for the presence of the GLX extension - if(!glXQueryExtension(display, NULL, NULL)) { - wxLogDebug(wxT("wxGLCanvas: GLX extension is missing\n")); - return FALSE; + if(!glXQueryExtension(display, NULL, NULL)) + { + wxLogDebug(wxT("wxGLCanvas: GLX extension is missing\n")); + return false; } if(attribList) { int data[512], arg=0, p=0; - + while( (attribList[arg]!=0) && (p<512) ) { switch( attribList[arg++] ) @@ -283,9 +290,9 @@ bool wxGLCanvas::Create( wxWindow *parent, data[p++]=GLX_BLUE_SIZE; data[p++]=attribList[arg++]; break; case WX_GL_MIN_ALPHA: data[p++]=GLX_ALPHA_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_DEPTH_SIZE: + case WX_GL_DEPTH_SIZE: data[p++]=GLX_DEPTH_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_STENCIL_SIZE: + case WX_GL_STENCIL_SIZE: data[p++]=GLX_STENCIL_SIZE; data[p++]=attribList[arg++]; break; case WX_GL_MIN_ACCUM_RED: data[p++]=GLX_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break; @@ -298,64 +305,64 @@ bool wxGLCanvas::Create( wxWindow *parent, default: break; } - } - data[p] = 0; + } + data[p] = 0; attribList = (int*) data; // Get an appropriate visual vi = glXChooseVisual(display, DefaultScreen(display), attribList); if(!vi) return FALSE; - + // Here we should make sure that vi is the same visual as the // one used by the xwindow drawable in wxCanvas. However, // there is currently no mechanism for this in wx_canvs.cc. } else { - // By default, we use the visual of xwindow + // By default, we use the visual of xwindow // NI: is this really senseful ? opengl in e.g. color index mode ? - XGetWindowAttributes(display, (Window)wxGetClientAreaWindow(this), &xwa); - vi_templ.visualid = XVisualIDFromVisual(xwa.visual); - vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n); - if(!vi) return FALSE; - glXGetConfig(display, vi, GLX_USE_GL, &val); - if(!val) return FALSE; - // Basically, this is it. It should be possible to use vi - // in glXCreateContext() below. But this fails with Mesa. - // I notified the Mesa author about it; there may be a fix. + XGetWindowAttributes(display, (Window)wxGetClientAreaWindow(this), &xwa); + vi_templ.visualid = XVisualIDFromVisual(xwa.visual); + vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n); + if(!vi) return FALSE; + glXGetConfig(display, vi, GLX_USE_GL, &val); + if(!val) return FALSE; + // Basically, this is it. It should be possible to use vi + // in glXCreateContext() below. But this fails with Mesa. + // I notified the Mesa author about it; there may be a fix. #ifdef OLD_MESA - // Construct an attribute list matching the visual - int a_list[32]; - n = 0; - if(vi->c_class==TrueColor || vi->c_class==DirectColor) { // RGBA visual - a_list[n++] = GLX_RGBA; - a_list[n++] = GLX_RED_SIZE; - a_list[n++] = bitcount(vi->red_mask); - a_list[n++] = GLX_GREEN_SIZE; - a_list[n++] = bitcount(vi->green_mask); - a_list[n++] = GLX_BLUE_SIZE; - a_list[n++] = bitcount(vi->blue_mask); - glXGetConfig(display, vi, GLX_ALPHA_SIZE, &val); - a_list[n++] = GLX_ALPHA_SIZE; - a_list[n++] = val; - } else { // Color index visual - glXGetConfig(display, vi, GLX_BUFFER_SIZE, &val); - a_list[n++] = GLX_BUFFER_SIZE; - a_list[n++] = val; - } - a_list[n] = None; - // XFree(vi); - vi = glXChooseVisual(display, DefaultScreen(display), a_list); - if(!vi) return FALSE; + // Construct an attribute list matching the visual + int a_list[32]; + n = 0; + if(vi->c_class==TrueColor || vi->c_class==DirectColor) { // RGBA visual + a_list[n++] = GLX_RGBA; + a_list[n++] = GLX_RED_SIZE; + a_list[n++] = bitcount(vi->red_mask); + a_list[n++] = GLX_GREEN_SIZE; + a_list[n++] = bitcount(vi->green_mask); + a_list[n++] = GLX_BLUE_SIZE; + a_list[n++] = bitcount(vi->blue_mask); + glXGetConfig(display, vi, GLX_ALPHA_SIZE, &val); + a_list[n++] = GLX_ALPHA_SIZE; + a_list[n++] = val; + } else { // Color index visual + glXGetConfig(display, vi, GLX_BUFFER_SIZE, &val); + a_list[n++] = GLX_BUFFER_SIZE; + a_list[n++] = val; + } + a_list[n] = None; + // XFree(vi); + vi = glXChooseVisual(display, DefaultScreen(display), a_list); + if(!vi) return FALSE; #endif /* OLD_MESA */ } m_vi = vi; // safe for later use - + wxCHECK_MSG( m_vi, FALSE, wxT("required visual couldn't be found") ); // Create the GLX context and make it current wxGLContext *share= m_sharedContext; - if (share==NULL && m_sharedContextOf) + if (share==NULL && m_sharedContextOf) share = m_sharedContextOf->GetContext(); m_glContext = new wxGLContext( TRUE, this, wxNullPalette, share ); @@ -365,13 +372,13 @@ bool wxGLCanvas::Create( wxWindow *parent, #endif SetCurrent(); - return TRUE; + return true; } wxGLCanvas::~wxGLCanvas(void) { XVisualInfo *vi = (XVisualInfo *) m_vi; - + if (vi) XFree( vi ); if (m_glContext) delete m_glContext; @@ -402,4 +409,3 @@ void wxGLCanvas::SetColour(const wxChar *col) #endif // wxUSE_GLCANVAS - diff --git a/src/x11/gsockx11.cpp b/src/x11/gsockx11.cpp index 580af78d5b..faf91d0e21 100644 --- a/src/x11/gsockx11.cpp +++ b/src/x11/gsockx11.cpp @@ -1,12 +1,17 @@ /* ------------------------------------------------------------------------- * Project: GSocket (Generic Socket) for WX - * Name: gsockmot.c + * Name: src/x11/gsockx11.cpp * Purpose: GSocket: X11 part * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ -#include "wx/setup.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if defined(__BORLANDC__) +#pragma hdrstop +#endif #if wxUSE_SOCKETS @@ -31,7 +36,7 @@ extern "C" void wxUnregisterSocketCallback(int fd, wxSocketTableType socketType) static void _GSocket_X11_Input(int *fid, void* data) { GSocket *socket = (GSocket *)data; - + socket->Detected_Read(); } diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp index 7fab513311..4d0cb919a9 100644 --- a/src/x11/reparent.cpp +++ b/src/x11/reparent.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: reparent.cpp +// Name: src/x11/reparent.cpp // Purpose: wxWindow // Author: Julian Smart // Modified by: @@ -9,6 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if defined(__BORLANDC__) +#pragma hdrstop +#endif + // ============================================================================ // declarations // ============================================================================ @@ -17,8 +24,6 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/setup.h" - #if !wxUSE_NANOX #include "wx/x11/reparent.h" @@ -88,7 +93,7 @@ bool wxReparenter::Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent) &children, &numchildren) || Xerror) { XSetErrorHandler(old); - return TRUE; + return true; } if (numchildren > 0) @@ -118,7 +123,7 @@ bool wxReparenter::Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent) } XSetErrorHandler(old); - return TRUE; + return true; } // Wait for an appropriate window to be created. @@ -132,7 +137,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar sm_toReparent = toReparent; sm_exactMatch = exactMatch; sm_name = windowName; - + Display* display = wxGlobalDisplay(); XSelectInput(display, RootWindowOfScreen(DefaultScreenOfDisplay(display)), @@ -142,10 +147,10 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar WM_STATE = XInternAtom(display, "WM_STATE", False); #ifdef __WXDEBUG__ - if (!windowName.IsEmpty()) + if (!windowName.empty()) wxLogDebug(_T("Waiting for window %s"), windowName.c_str()); #endif - + sm_done = FALSE; wxEventLoop eventLoop; @@ -169,7 +174,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar #endif } } - return TRUE; + return true; } bool wxReparenter::ProcessXEvent(WXEvent* event) @@ -183,13 +188,13 @@ bool wxReparenter::ProcessXEvent(WXEvent* event) { wxLogDebug(_T("Window was mapped")); } - + if (xevent->type == MapNotify && !xevent->xmap.override_redirect && (client = (Window) FindAClientWindow((WXWindow) xevent->xmap.window, sm_name))) { wxLogDebug(_T("Found a client window, about to reparent")); wxASSERT(sm_toReparent->GetParent() == NULL); - + sm_toReparent->SetHandle((WXWindow) client); sm_newParent->AddChild(sm_toReparent); sm_done = Reparent(sm_newParent, sm_toReparent); @@ -202,7 +207,7 @@ bool wxReparenter::ProcessXEvent(WXEvent* event) sm_toReparent->SetHandle((WXWindow) xevent->xmap.window); sm_newParent->AddChild(sm_toReparent); wxASSERT(sm_toReparent->GetParent() == NULL); - + sm_done = Reparent(sm_newParent, sm_toReparent); return sm_done; } @@ -223,7 +228,7 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name) Window result = 0; XErrorHandler old; char *clientName; - + Xerror = False; old = XSetErrorHandler(ErrorHandler); rvalue = XGetWindowProperty((Display*) wxGetDisplay(), @@ -241,26 +246,26 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name) XFree((char *) propreturn); } XFetchName((Display*) wxGetDisplay(), (Window) window, &clientName); - + wxString str1(name); wxString str2 = wxString::FromAscii(clientName); str1.Lower(); str2.Lower(); - + bool matches; if (sm_exactMatch) matches = (name == wxString::FromAscii(clientName)); else matches = (str1.Contains(str2) || str2.Contains(str1)); - + XFree(clientName); - + if (matches) return (WXWindow) window; else return NULL; } - + old = XSetErrorHandler(ErrorHandler); if (!XQueryTree((Display*) wxGetDisplay(), (Window) window, &returnroot, &returnparent, &children, &numchildren) || Xerror) @@ -269,7 +274,7 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name) return NULL; } XSetErrorHandler(old); - + result = 0; for (i=0; i<(int)numchildren && !result ;i++) { result = (Window) FindAClientWindow((WXWindow) children[i], name); diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp index 071f4f6b98..501b9fcaeb 100644 --- a/src/x11/utils.cpp +++ b/src/x11/utils.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utils.cpp +// Name: src/x11/utils.cpp // Purpose: Various utilities // Author: Julian Smart // Modified by: @@ -9,6 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if defined(__BORLANDC__) +#pragma hdrstop +#endif + // ============================================================================ // declarations // ============================================================================ @@ -17,7 +24,6 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/setup.h" #include "wx/utils.h" #include "wx/app.h" #include "wx/apptrait.h" @@ -198,11 +204,11 @@ bool wxSetDisplay(const wxString& display_name) { gs_displayName = display_name; - if ( display_name.IsEmpty() ) + if ( display_name.empty() ) { gs_currentDisplay = NULL; - return TRUE; + return true; } else { @@ -211,7 +217,7 @@ bool wxSetDisplay(const wxString& display_name) if (display) { gs_currentDisplay = (WXDisplay*) display; - return TRUE; + return true; } else return FALSE; @@ -351,20 +357,20 @@ wxString wxGetXEventName(XEvent& event) return str; #else int type = event.xany.type; - static char* event_name[] = { - "", "unknown(-)", // 0-1 - "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", // 2-5 - "MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn", // 6-9 - "FocusOut", "KeymapNotify", "Expose", "GraphicsExpose", // 10-13 - "NoExpose", "VisibilityNotify", "CreateNotify", // 14-16 - "DestroyNotify", "UnmapNotify", "MapNotify", "MapRequest",// 17-20 - "ReparentNotify", "ConfigureNotify", "ConfigureRequest", // 21-23 - "GravityNotify", "ResizeRequest", "CirculateNotify", // 24-26 - "CirculateRequest", "PropertyNotify", "SelectionClear", // 27-29 - "SelectionRequest", "SelectionNotify", "ColormapNotify", // 30-32 - "ClientMessage", "MappingNotify", // 33-34 - "unknown(+)"}; // 35 - type = wxMin(35, type); type = wxMax(1, type); + static char* event_name[] = { + "", "unknown(-)", // 0-1 + "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", // 2-5 + "MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn", // 6-9 + "FocusOut", "KeymapNotify", "Expose", "GraphicsExpose", // 10-13 + "NoExpose", "VisibilityNotify", "CreateNotify", // 14-16 + "DestroyNotify", "UnmapNotify", "MapNotify", "MapRequest",// 17-20 + "ReparentNotify", "ConfigureNotify", "ConfigureRequest", // 21-23 + "GravityNotify", "ResizeRequest", "CirculateNotify", // 24-26 + "CirculateRequest", "PropertyNotify", "SelectionClear", // 27-29 + "SelectionRequest", "SelectionNotify", "ColormapNotify", // 30-32 + "ClientMessage", "MappingNotify", // 33-34 + "unknown(+)"}; // 35 + type = wxMin(35, type); type = wxMax(1, type); return wxString::FromAscii(event_name[type]); #endif } diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 6f3a3fdc16..c2021f0162 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -9,6 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if defined(__BORLANDC__) +#pragma hdrstop +#endif + // ============================================================================ // declarations // ============================================================================ @@ -17,7 +24,6 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/setup.h" #include "wx/menu.h" #include "wx/dc.h" #include "wx/dcclient.h" -- 2.45.2