Include wx/object.h according to precompiled headers of wx/wx.h (with other minor cleaning).

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

src/common/db.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        db.cpp
+// Name:        src/common/db.cpp
 // Purpose:     Implementation of the wxDb class.  The wxDb class represents a connection
 //              to an ODBC data source.  The wxDb class allows operations on the data
 //              source such as opening and closing the data source.
@@ -21,33 +21,29 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-/*
-// SYNOPSIS START
-// SYNOPSIS STOP
-*/
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
-#ifdef DBDEBUG_CONSOLE
+#if wxUSE_ODBC
-    #include "wx/ioswrap.h"
-#endif
 
 #ifndef WX_PRECOMP
-    #include "wx/string.h"
     #include "wx/object.h"
+    #include "wx/string.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/log.h"
 #endif
+
+#ifdef DBDEBUG_CONSOLE
+    #include "wx/ioswrap.h"
+#endif
+
 #include "wx/filefn.h"
 #include "wx/wxchar.h"
 
-#if wxUSE_ODBC
-
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -201,7 +197,7 @@ void wxDbConnectInf::FreeHenv()
 
 void wxDbConnectInf::SetDsn(const wxString &dsn)
 {
-    wxASSERT(dsn.Length() < WXSIZEOF(Dsn));
+    wxASSERT(dsn.length() < WXSIZEOF(Dsn));
 
     wxStrncpy(Dsn, dsn, WXSIZEOF(Dsn)-1);
     Dsn[WXSIZEOF(Dsn)-1] = 0;  // Prevent buffer overrun
@@ -210,7 +206,7 @@ void wxDbConnectInf::SetDsn(const wxString &dsn)
 
 void wxDbConnectInf::SetUserID(const wxString &uid)
 {
-    wxASSERT(uid.Length() < WXSIZEOF(Uid));
+    wxASSERT(uid.length() < WXSIZEOF(Uid));
     wxStrncpy(Uid, uid, WXSIZEOF(Uid)-1);
     Uid[WXSIZEOF(Uid)-1] = 0;  // Prevent buffer overrun
 }  // wxDbConnectInf::SetUserID()
@@ -218,7 +214,7 @@ void wxDbConnectInf::SetUserID(const wxString &uid)
 
 void wxDbConnectInf::SetPassword(const wxString &password)
 {
-    wxASSERT(password.Length() < WXSIZEOF(AuthStr));
+    wxASSERT(password.length() < WXSIZEOF(AuthStr));
 
     wxStrncpy(AuthStr, password, WXSIZEOF(AuthStr)-1);
     AuthStr[WXSIZEOF(AuthStr)-1] = 0;  // Prevent buffer overrun
@@ -226,7 +222,7 @@ void wxDbConnectInf::SetPassword(const wxString &password)
 
 void wxDbConnectInf::SetConnectionStr(const wxString &connectStr)
 {
-    wxASSERT(connectStr.Length() < WXSIZEOF(ConnectionStr));
+    wxASSERT(connectStr.length() < WXSIZEOF(ConnectionStr));
 
     useConnectionStr = wxStrlen(connectStr) > 0;
 
@@ -826,15 +822,15 @@ bool wxDb::open(bool failOnDataTypeUnsupported)
 
 bool wxDb::Open(const wxString& inConnectStr, bool failOnDataTypeUnsupported)
 {
-    wxASSERT(inConnectStr.Length());
+    wxASSERT(inConnectStr.length());
     return Open(inConnectStr, NULL, failOnDataTypeUnsupported);
 }
 
 bool wxDb::Open(const wxString& inConnectStr, SQLHWND parentWnd, bool failOnDataTypeUnsupported)
 {
-    dsn        = wxT("");
+    dsn        = wxEmptyString;
-    uid        = wxT("");
+    uid        = wxEmptyString;
-    authStr    = wxT("");
+    authStr    = wxEmptyString;
 
     RETCODE retcode;
 
@@ -861,7 +857,7 @@ bool wxDb::Open(const wxString& inConnectStr, SQLHWND parentWnd, bool failOnData
     inConnectionStr = inConnectStr;
 
     retcode = SQLDriverConnect(hdbc, parentWnd, (SQLTCHAR FAR *)inConnectionStr.c_str(),
-                        (SWORD)inConnectionStr.Length(), (SQLTCHAR FAR *)outConnectBuffer,
+                        (SWORD)inConnectionStr.length(), (SQLTCHAR FAR *)outConnectBuffer,
                         sizeof(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE );
 
     if ((retcode != SQL_SUCCESS) &&
@@ -878,13 +874,13 @@ bool wxDb::Open(const wxString& inConnectStr, SQLHWND parentWnd, bool failOnData
 /********** wxDb::Open() **********/
 bool wxDb::Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr, bool failOnDataTypeUnsupported)
 {
-    wxASSERT(Dsn.Length());
+    wxASSERT(!Dsn.empty());
     dsn        = Dsn;
     uid        = Uid;
     authStr    = AuthStr;
 
-    inConnectionStr = wxT("");
+    inConnectionStr = wxEmptyString;
-    outConnectionStr = wxT("");
+    outConnectionStr = wxEmptyString;
 
     RETCODE retcode;
 
@@ -966,7 +962,7 @@ bool wxDb::Open(wxDb *copyDb)
         inConnectionStr = copyDb->GetConnectionInStr();
 
         retcode = SQLDriverConnect(hdbc, NULL, (SQLTCHAR FAR *)inConnectionStr.c_str(),
-                            (SWORD)inConnectionStr.Length(), (SQLTCHAR FAR *)outConnectBuffer,
+                            (SWORD)inConnectionStr.length(), (SQLTCHAR FAR *)outConnectBuffer,
                             sizeof(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE);
 
         if ((retcode != SQL_SUCCESS) &&
@@ -1889,7 +1885,7 @@ void wxDb::DispNextError(void)
 /********** wxDb::logError() **********/
 void wxDb::logError(const wxString &errMsg, const wxString &SQLState)
 {
-    wxASSERT(errMsg.Length());
+    wxASSERT(errMsg.length());
 
     static int pLast = -1;
     int dbStatus;
@@ -1905,7 +1901,7 @@ void wxDb::logError(const wxString &errMsg, const wxString &SQLState)
     wxStrncpy(errorList[pLast], errMsg, DB_MAX_ERROR_MSG_LEN);
     errorList[pLast][DB_MAX_ERROR_MSG_LEN] = 0;
 
-    if (SQLState.Length())
+    if (SQLState.length())
         if ((dbStatus = TranslateSqlState(SQLState)) != DB_ERR_FUNCTION_SEQUENCE_ERROR)
             DB_STATUS = dbStatus;
 
@@ -2170,7 +2166,7 @@ bool wxDb::CreateView(const wxString &viewName, const wxString &colList,
     sqlStmt  = wxT("CREATE VIEW ");
     sqlStmt += viewName;
 
-    if (colList.Length())
+    if (colList.length())
     {
         sqlStmt += wxT(" (");
         sqlStmt += colList;
@@ -3452,7 +3448,7 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
  *       to avoid undesired unbinding of columns.
  */
 {
-    wxASSERT(fileName.Length());
+    wxASSERT(fileName.length());
 
     RETCODE   retcode;
     SQLLEN    cb;
@@ -3572,14 +3568,14 @@ bool wxDb::TableExists(const wxString &tableName, const wxChar *userID, const wx
  *        userID != ""    ... UserID set equal to 'userID'
  */
 {
-    wxASSERT(tableName.Length());
+    wxASSERT(tableName.length());
 
     wxString TableName;
 
     if (Dbms() == dbmsDBASE)
     {
         wxString dbName;
-        if (tablePath.Length())
+        if (tablePath.length())
             dbName.Printf(wxT("%s/%s.dbf"), tablePath.c_str(), tableName.c_str());
         else
             dbName.Printf(wxT("%s.dbf"), tableName.c_str());
@@ -3649,7 +3645,7 @@ bool wxDb::TableExists(const wxString &tableName, const wxChar *userID, const wx
 bool wxDb::TablePrivileges(const wxString &tableName, const wxString &priv, const wxChar *userID,
                             const wxChar *schema, const wxString &WXUNUSED(tablePath))
 {
-    wxASSERT(tableName.Length());
+    wxASSERT(tableName.length());
 
     wxDbTablePrivilegeInfo  result;
     SQLLEN  cbRetVal;
@@ -3798,7 +3794,7 @@ const wxString wxDb::SQLColumnName(const wxChar *colName)
 bool wxDb::SetSqlLogging(wxDbSqlLogState state, const wxString &filename, bool append)
 {
     wxASSERT(state == sqlLogON  || state == sqlLogOFF);
-    wxASSERT(state == sqlLogOFF || filename.Length());
+    wxASSERT(state == sqlLogOFF || filename.length());
 
     if (state == sqlLogON)
     {
@@ -3828,7 +3824,7 @@ bool wxDb::SetSqlLogging(wxDbSqlLogState state, const wxString &filename, bool a
 /********** wxDb::WriteSqlLog() **********/
 bool wxDb::WriteSqlLog(const wxString &logMsg)
 {
-    wxASSERT(logMsg.Length());
+    wxASSERT(logMsg.length());
 
     if (fpSqlLog == 0 || sqlLogState == sqlLogOFF)
         return false;
@@ -4000,8 +3996,8 @@ bool wxDb::ModifyColumn(const wxString &tableName, const wxString &columnName,
                         int dataType, ULONG columnLength,
                         const wxString &optionalParam)
 {
-    wxASSERT(tableName.Length());
+    wxASSERT(tableName.length());
-    wxASSERT(columnName.Length());
+    wxASSERT(columnName.length());
     wxASSERT((dataType == DB_DATA_TYPE_VARCHAR && columnLength > 0) ||
              dataType != DB_DATA_TYPE_VARCHAR);
 
@@ -4079,7 +4075,7 @@ bool wxDb::ModifyColumn(const wxString &tableName, const wxString &columnName,
     }
 
     // for passing things like "NOT NULL"
-    if (optionalParam.Length())
+    if (optionalParam.length())
     {
         sqlStmt += wxT(" ");
         sqlStmt += optionalParam;

src/common/dbtable.cpp

@@ -11,11 +11,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-/*
-// SYNOPSIS START
-// SYNOPSIS STOP
-*/
-
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -24,6 +19,14 @@
 
 #if wxUSE_ODBC
 
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/string.h"
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"
+#endif
+
 #ifdef DBDEBUG_CONSOLE
 #if wxUSE_IOSTREAMH
     #include <iostream.h>
@@ -33,13 +36,6 @@
     #include "wx/ioswrap.h"
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/object.h"
-    #include "wx/list.h"
-    #include "wx/utils.h"
-    #include "wx/log.h"
-#endif
 #include "wx/filefn.h"
 
 #include <stdio.h>

src/common/imagpcx.cpp

@@ -18,6 +18,7 @@
 #if wxUSE_IMAGE && wxUSE_PCX
 
 #ifndef WX_PRECOMP
+    #include "wx/object.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/palette.h"
@@ -29,7 +30,6 @@
 
 #include "wx/hash.h"
 #include "wx/list.h"
-#include "wx/object.h"
 
 //-----------------------------------------------------------------------------
 // wxPCXHandler

src/common/object.cpp

@@ -18,8 +18,8 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/hash.h"
     #include "wx/object.h"
+    #include "wx/hash.h"
 #endif
 
 #include <string.h>

src/common/socket.cpp

@@ -22,9 +22,12 @@
 
 #if wxUSE_SOCKETS
 
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+#endif
+
 #include "wx/app.h"
 #include "wx/apptrait.h"
-#include "wx/object.h"
 #include "wx/string.h"
 #include "wx/timer.h"
 #include "wx/utils.h"

src/common/xti.cpp

@@ -17,13 +17,13 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/hash.h"
-#include "wx/object.h"
-#endif
-
 #if wxUSE_EXTENDED_RTTI
 
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/hash.h"
+#endif
+
 #include "wx/xti.h"
 #include "wx/xml/xml.h"
 #include "wx/tokenzr.h"
@@ -763,4 +763,5 @@ void wxGenericPropertyAccessor::GetProperty(const wxObject *object, wxxVariant&
     wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
     value = dynobj->GetProperty( m_propertyName ) ;
 }
-#endif
+
+#endif // wxUSE_EXTENDED_RTTI

src/common/xtistrm.cpp

@@ -16,17 +16,17 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_EXTENDED_RTTI
+
 #ifndef WX_PRECOMP
-#include "wx/hash.h"
     #include "wx/object.h"
+    #include "wx/hash.h"
 #endif
 
 #include "wx/tokenzr.h"
 #include "wx/txtstrm.h"
 #include "wx/event.h"
 
-#if wxUSE_EXTENDED_RTTI
-
 #include "wx/xtistrm.h"
 
 #include "wx/beforestd.h"
@@ -844,4 +844,4 @@ void wxCodeDepersister::SetConnect(int eventSourceObjectID,
 
 WX_DEFINE_OBJARRAY(wxxVariantArray);
 
-#endif
+#endif // wxUSE_EXTENDED_RTTI

src/common/xtixml.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/xtistrm.cpp
+// Name:        src/common/xtixml.cpp
 // Purpose:     streaming runtime metadata information
 // Author:      Stefan Csomor
 // Modified by:
@@ -16,9 +16,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_EXTENDED_RTTI
+
 #ifndef WX_PRECOMP
-#include "wx/hash.h"
     #include "wx/object.h"
+    #include "wx/hash.h"
 #endif
 
 #include "wx/xml/xml.h"
@@ -26,8 +28,6 @@
 #include "wx/txtstrm.h"
 #include "wx/event.h"
 
-#if wxUSE_EXTENDED_RTTI
-
 #include "wx/xtistrm.h"
 #include "wx/xtixml.h"
 
@@ -534,4 +534,4 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks)
     return wxInvalidObjectID ;
 }
 
-#endif
+#endif // wxUSE_EXTENDED_RTTI

src/gtk/data.cpp

@@ -10,7 +10,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifndef WX_PRECOMP
     #include "wx/object.h"
+#endif
+
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/cursor.h"
@@ -31,4 +34,3 @@ int g_openDialogs = 0;
 /* true when the message queue is empty. this gets set to
    false by all event callbacks before anything else is done */
 bool g_isIdle = false;
-

src/gtk1/data.cpp

@@ -10,7 +10,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifndef WX_PRECOMP
     #include "wx/object.h"
+#endif
+
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/cursor.h"

src/html/helpdlg.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpdlg.cpp
+// Name:        src/html/helpdlg.cpp
 // Purpose:     wxHtmlHelpDialog
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
@@ -19,10 +19,10 @@
 #if wxUSE_WXHTML_HELP
 
 #ifndef WXPRECOMP
+    #include "wx/object.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 
-    #include "wx/object.h"
     #include "wx/sizer.h"
 
     #include "wx/bmpbuttn.h"
@@ -71,7 +71,7 @@ bool wxHtmlHelpDialog::Create(wxWindow* parent, wxWindowID id,
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
                     wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h),
                     wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER, wxT("wxHtmlHelp"));
-    m_HtmlHelpWin->Create(this, -1, wxDefaultPosition, GetClientSize(),
+    m_HtmlHelpWin->Create(this, wxID_ANY, wxDefaultPosition, GetClientSize(),
         wxTAB_TRAVERSAL|wxNO_BORDER, style);
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);
@@ -133,4 +133,3 @@ void wxHtmlHelpDialog::OnCloseWindow(wxCloseEvent& evt)
 }
 
 #endif // wxUSE_WXHTML_HELP
-

src/html/helpfrm.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpfrm.cpp
+// Name:        src/html/helpfrm.cpp
 // Purpose:     wxHtmlHelpFrame
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
@@ -20,10 +20,10 @@
 #if wxUSE_WXHTML_HELP
 
 #ifndef WXPRECOMP
+    #include "wx/object.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 
-    #include "wx/object.h"
     #include "wx/sizer.h"
 
     #include "wx/bmpbuttn.h"
@@ -97,7 +97,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 #if wxUSE_STATUSBAR
     CreateStatusBar();
 #endif
-    m_HtmlHelpWin->Create(this, -1, wxDefaultPosition, wxDefaultSize,
+    m_HtmlHelpWin->Create(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
         wxTAB_TRAVERSAL|wxNO_BORDER, style);
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);
@@ -194,7 +194,7 @@ void wxHtmlHelpFrame::AddGrabIfNeeded()
 {
     // So far, wxGTK only
 #ifdef __WXGTK__
-    bool needGrab = FALSE;
+    bool needGrab = false;
 
     // Check if there are any modal windows present,
     // in which case we need to add a grab.
@@ -206,7 +206,7 @@ void wxHtmlHelpFrame::AddGrabIfNeeded()
         wxDialog *dialog = wxDynamicCast(win, wxDialog);
 
         if (dialog && dialog->IsModal())
-            needGrab = TRUE;
+            needGrab = true;
     }
 
     if (needGrab)

src/html/helpwnd.cpp

@@ -20,10 +20,10 @@
 #if wxUSE_WXHTML_HELP
 
 #ifndef WXPRECOMP
+    #include "wx/object.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 
-    #include "wx/object.h"
     #include "wx/sizer.h"
 
     #include "wx/bmpbuttn.h"

src/mac/carbon/cfsocket.cpp

@@ -17,9 +17,12 @@
 
 #if wxUSE_SOCKETS
 
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+#endif
+
 #include "wx/app.h"
 #include "wx/apptrait.h"
-#include "wx/object.h"
 #include "wx/string.h"
 #include "wx/timer.h"
 #include "wx/utils.h"

src/mac/carbon/printdlg.cpp

@@ -13,7 +13,10 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
+#ifndef WXPRECOMP
     #include "wx/object.h"
+#endif
+
 #include "wx/printdlg.h"
 #include "wx/mac/printdlg.h"
 #include "wx/dcprint.h"

src/mac/carbon/sound.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sound.cpp
+// Name:        src/mac/carbon/sound.cpp
 // Purpose:     wxSound class implementation: optional
 // Author:      Ryan Norton
 // Modified by: Stefan Csomor
@@ -9,9 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_SOUND
+
+#ifndef WX_PRECOMP
     #include "wx/object.h"
+#endif
+
 #include "wx/string.h"
 #include "wx/log.h"
 #include "wx/file.h"
@@ -19,8 +25,6 @@
 #include "wx/timer.h"
 #include "wx/intl.h"
 
-#if wxUSE_SOUND
-
 // Carbon QT Implementation Details -
 //
 // Memory:

src/mac/classic/printdlg.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printdlg.cpp
+// Name:        src/mac/classic/printdlg.cpp
 // Purpose:     wxPrintDialog, wxPageSetupDialog
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,7 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
     #include "wx/object.h"
+#endif
+
 #include "wx/printdlg.h"
 #include "wx/dcprint.h"
 #include "wx/msgdlg.h"
@@ -24,7 +30,7 @@ wxPrintDialog::wxPrintDialog()
 {
     m_dialogParent = NULL;
     m_printerDC = NULL;
-    m_destroyDC = TRUE;
+    m_destroyDC = true;
 }
 
 wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintDialogData* data)
@@ -45,12 +51,12 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
 {
     m_dialogParent = p;
     m_printerDC = NULL;
-    m_destroyDC = TRUE;
+    m_destroyDC = true;
 
     if ( data )
         m_printDialogData = *data;
 
-    return TRUE;
+    return true;
 }
 
 wxPrintDialog::~wxPrintDialog()
@@ -99,7 +105,7 @@ bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
     if (data)
         m_pageSetupData = (*data);
 
-    return TRUE;
+    return true;
 }
 
 wxPageSetupDialog::~wxPageSetupDialog()
@@ -115,4 +121,3 @@ int wxPageSetupDialog::ShowModal()
 
     return result ;
 }
-

src/mac/classic/sound.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sound.cpp
+// Name:        src/mac/classic/sound.cpp
 // Purpose:     wxSound class implementation: optional
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,12 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/object.h"
+// For compilers that support precompilation, includes "wx.h".
-#include "wx/string.h"
+#include "wx/wxprec.h"
-#include "wx/sound.h"
 
 #if wxUSE_SOUND
 
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+#endif
+
+#include "wx/string.h"
+#include "wx/sound.h"
+
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #ifndef __DARWIN__
@@ -235,5 +241,4 @@ void TimerCallBack(HWND hwnd,UINT uMsg,UINT idEvent,DWORD dwTime)
     KillTimer(0,timerID);
 }*/
 
-
+#endif // wxUSE_SOUND
-#endif

src/os2/checklst.cpp

@@ -18,7 +18,10 @@
 
 #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
 
+#ifndef WX_PRECOMP
     #include "wx/object.h"
+#endif
+
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/bitmap.h"