wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

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

diff --git a/src/mgl/data.cpp b/src/mgl/data.cpp
index d22b68b1efae527b430084ce9dadabe189c22635..1fb6225976e92d9c700333a3528f17f8741650d9 100644 (file)
--- a/src/mgl/data.cpp
+++ b/src/mgl/data.cpp
@@ -14,7 +14,6 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
 #include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to

diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
index f14e2d526d9c104f3d747d24b98a7dabd3a2a0c8..bd6e21b38a2b9019d3a3ea89b9f219ad129da003 100644 (file)
--- a/src/mgl/dirmgl.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mgl/dir.cpp
+// Name:        src/mgl/dir.cpp
 // Purpose:     wxDir implementation for MGL
 // Author:      Vaclav Slavik, Vadim Zeitlin
 // Modified by:
@@ -10,14 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -25,7 +17,13 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 
 #ifndef __UNIX__
 
@@ -272,4 +270,3 @@ bool wxDir::GetNext(wxString *filename) const
 }
 
 #endif // !__UNIX__
-

diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
index f00e22fd389102f364e1b8ebe8b7bf1927f48394..58866a8120d024b0cf4ed0c874cf00921357167e 100644 (file)
--- a/src/mgl/fontenum.cpp
+++ b/src/mgl/fontenum.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/unix/fontenum.cpp
+// Name:        src/mgl/fontenum.cpp
 // Purpose:     wxFontEnumerator class for MGL
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -7,6 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -15,14 +22,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/defs.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/utils.h"
@@ -45,7 +44,7 @@
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
-    bool found = FALSE;
+    bool found = false;
     wxMGLFontFamilyList *list = wxTheFontsManager->GetFamilyList();
     wxMGLFontFamilyList::Node *node;
     wxMGLFontFamily *f = NULL;
@@ -53,7 +52,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
     if ( encoding != wxFONTENCODING_SYSTEM )
         wxGetNativeFontEncoding(encoding, &info);
-     
+
     for (node = list->GetFirst(); node; node = node->GetNext())
     {
         f = node->GetData();
@@ -61,9 +60,9 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
         if ( (!fixedWidthOnly || f->GetInfo()->isFixed) &&
              (encoding == wxFONTENCODING_SYSTEM || wxTestFontEncoding(info)) )
         {
-            found = TRUE;
+            found = true;
             if ( !OnFacename(f->GetName()) )
-                return TRUE;
+                return true;
         }
     }
 
@@ -72,7 +71,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
-    static wxFontEncoding encodings[] = 
+    static wxFontEncoding encodings[] =
     {
         wxFONTENCODING_ISO8859_1,
         wxFONTENCODING_ISO8859_2,
@@ -98,11 +97,11 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
         wxFONTENCODING_CP1256,
         wxFONTENCODING_CP1257,
         wxFONTENCODING_KOI8,
-        
+
         wxFONTENCODING_SYSTEM
     };
-    
-    static const char *encodingNames[] = 
+
+    static const char *encodingNames[] =
     {
         "iso88590-1",
         "iso88590-2",
@@ -128,18 +127,18 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
         "koi-8",
         NULL
     };
-    
+
     wxNativeEncodingInfo info;
     info.facename = family;
-    
+
     for (size_t i = 0; encodings[i] != wxFONTENCODING_SYSTEM; i++)
     {
         if ( !wxGetNativeFontEncoding(encodings[i], &info) ||
-             !wxTestFontEncoding(info) ) 
+             !wxTestFontEncoding(info) )
             continue;
         if ( !OnFontEncoding(family, encodingNames[i]) )
             break;
     }
 
-    return TRUE;
+    return true;
 }

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index 80646a601ffb27f3691971fc03bb5596aee64649..1ec5da6c11091d9cc1804f17d1fc26b2f85a6dfc 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -7,6 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -15,15 +22,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/toplevel.h"
     #include "wx/app.h"
 #endif // WX_PRECOMP

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index e47b8c2b1b1772a7425637bcc4a1d000bac20e1d..de320bafb0882dec52cb60b28314241b5b21293c 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bmpbuttn.cpp
+// Name:        src/motif/bmpbuttn.cpp
 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtScreen XTSCREEN
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/bmpbuttn.h"
 
 #ifdef __VMS__
@@ -77,7 +75,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
         xmPushButtonWidgetClass, parentWidget,
 #endif
         // See comment for wxButton::SetDefault
-        // XmNdefaultButtonShadowThickness, 1, 
+        // XmNdefaultButtonShadowThickness, 1,
         XmNrecomputeSize, False,
         NULL);
 
@@ -265,4 +263,3 @@ wxSize wxBitmapButton::DoGetBestSize() const
 
     return ret;
 }
-

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 2bd938cdab6ea712614ca9c029bfe7599c60c1b1..bec6dd5146469e9ac469caada8c8b8124669e1c6 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/motif/bmpmotif.cpp
 // Purpose:     wxBitmap
 // Author:      Julian Smart, originally in bitmap.cpp
 // Modified by:
@@ -17,7 +17,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
 #include "wx/motif/bmpmotif.h"
 
 #ifdef __VMS__

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index b5ce08a96006e4979de75f769d74a21bbbf62742..af7a37ac49308a07ca2de03b7d2916935b921e9f 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.cpp
+// Name:        src/motif/button.cpp
 // Purpose:     wxButton
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/button.h"
 
 #ifdef __VMS__
@@ -51,7 +49,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
     wxString label(lbl);
     if (label.empty() && wxIsStockID(id))
         label = wxGetStockLabel(id);
-    
+
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 
@@ -76,7 +74,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
         XmNlabelString, text(),
         XmNrecomputeSize, False,
         // See comment for wxButton::SetDefault
-        // XmNdefaultButtonShadowThickness, 1, 
+        // XmNdefaultButtonShadowThickness, 1,
         NULL);
 
     XtAddCallback ((Widget) m_mainWidget,

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 6b9402557b60c7c50fa3401fc72c7b0ba44811e9..948b2c673a9a7ee36b7d0722b38358bd0e017f60 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.cpp
+// Name:        src/motif/checkbox.cpp
 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/checkbox.h"
 #include "wx/tglbtn.h"
 #include "wx/utils.h"
@@ -63,7 +61,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     wxString label1(wxStripMenuCodes(label));
     wxXmString text( label1 );
-    
+
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
@@ -77,7 +75,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,
 #endif
         NULL);
-    
+
     XtAddCallback( (Widget)m_mainWidget,
                    XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
                    (XtPointer)this );

diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index 8b8ee7ef6e3b64006dc2b8df269363667952fa88..a7e8eacd04a92784e12f9e80b92cebdcab2e826d 100644 (file)
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -18,8 +18,6 @@
 
 #if wxUSE_CHECKLISTBOX
 
-#include "wx/defs.h"
-
 #include "wx/checklst.h"
 #include "wx/arrstr.h"
 

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 1353a842a924c251b42192aa36ae3f86169d43a7..9797969ea70a22b5e4a455f55b28e209fa85f3cd 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -21,8 +21,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_CLIPBOARD
 
 #include "wx/app.h"

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index e783854df5cee3e4e984153283b18a1247ebb438..18f8bbeb686c1aca9453b273173c9cbaeb164913 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.cpp
+// Name:        src/motif/control.cpp
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/utils.h"

diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index 0647d3501bfe44ecc8ad57b7e0868e3a4a73765d..e27b51fab6843ea17d19a5a21f81560d16fbf7c9 100644 (file)
--- a/src/motif/dataobj.cpp
+++ b/src/motif/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dataobj.cpp
+// Name:        src/motif/dataobj.cpp
 // Purpose:     wxDataObject class
 // Author:      Julian Smart
 // Id:          $Id$
@@ -10,8 +10,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_CLIPBOARD
 
 #include "wx/dataobj.h"
@@ -106,7 +104,7 @@ wxString wxDataFormat::GetId() const
 {
     char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
     wxString ret( t );  // this will convert from ascii to Unicode
-    if (t) 
+    if (t)
         XFree( t );
     return ret;
 }

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index 46dfe4de2f0330889d5b3211f8365784f57cb6b5..c6bd10e42507e314a96d920912236ca32dd9a3e0 100644 (file)
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dc.cpp
+// Name:        src/motif/dc.cpp
 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:
@@ -14,9 +14,8 @@
 
 #include "wx/dc.h"
 #include "wx/dcmemory.h"
-#include "wx/defs.h"
 
-    IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 //-----------------------------------------------------------------------------
 // wxDC
@@ -212,4 +211,3 @@ void wxDC::ComputeScaleAndOrigin()
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 }
-

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 0d3c9abdbe28fedf4facd0e30680d4ee8d64b98a..3ac03441b955a980ab90d9eb8fe8516771a0dc05 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filedlg.cpp
+// Name:        src/motif/filedlg.cpp
 // Purpose:     wxFileDialog
 // Author:      Julian Smart
 // Modified by:
@@ -18,7 +18,6 @@
 #define XtWindow XTWINDOW
 #endif
 
-#include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/filedlg.h"
 #include "wx/intl.h"

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 07d193cb74353bf239f6dee5ec32109bce3c84a2..a0a1c809b90dedc3f510392b16c1b86017d49988 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
@@ -434,7 +432,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
     return M_FONTDATA->m_faceName ;
 }
@@ -478,7 +476,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
-    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
+    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().empty())
         GetInternalFont();
 
     return &(M_FONTDATA->m_nativeFontInfo);
@@ -536,7 +534,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
 #endif
     f->m_display = ( display ? display : wxGetDisplay() );
     f->m_scale = intScale;
-    
+
 #if wxMOTIF_USE_RENDER_TABLE
     XmRendition rendition;
     XmRenderTable renderTable;
@@ -652,13 +650,13 @@ void wxGetTextExtent(WXDisplay* display, const wxFont& font, double scale,
 {
     XRectangle ink, logical;
     WXFontSet fset = font.GetFontSet(scale, display);
-    
+
     XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(), &ink, &logical);
 
     if( width ) *width = logical.width;
     if( height ) *height = logical.height;
-    if( ascent ) *ascent = -logical.y;    
-    if( descent ) *descent = logical.height + logical.y;    
+    if( ascent ) *ascent = -logical.y;
+    if( descent ) *descent = logical.height + logical.y;
 }
 
 #else // if !wxMOTIF_NEW_FONT_HANDLING

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 9bc0d3a2afacb2209075ebaddfc69ab292c9255f..21d7a88ac0f2188bbdf6fc9faa5f5c7f85c5a7ff 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"
@@ -731,4 +729,3 @@ bool wxMenuBar::SetFont(const wxFont& font)
 
     return true;
 }
-

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index c680eaeaadd7d25aab7401913e603b3e8226681e..cbed0910f42b73c87905a418d3ee103eff0339a5 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/motif/menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Julian Smart
 // Modified by:
@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/utils.h"
@@ -171,7 +169,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar,
             (wxStripMenuCodes(m_text),
             xmLabelGadgetClass, (Widget) menu, NULL);
     }
-    else if ((!m_text.IsNull() && m_text != "") && (!m_subMenu))
+    else if (!m_text.empty() && !m_subMenu)
     {
         wxString strName = wxStripMenuCodes(m_text);
         if (IsCheckable())
@@ -258,7 +256,7 @@ void wxMenuItem::DestroyItem(bool full)
         ;      // Nothing
 
     }
-    else if ((!m_text.IsNull() && (m_text != "")) && !m_subMenu)
+    else if (!m_text.empty() && !m_subMenu)
     {
         if (m_buttonWidget)
         {
@@ -412,4 +410,3 @@ wxMenuItemDisarmCallback (Widget WXUNUSED(w), XtPointer clientData,
         }
     }
 }
-

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index f51da838f19b7faf09e604adef42d9edcc939939..95105ec2a8ebeb729ff1366fc64821a50f59739d 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #pragma message disable nosimpint

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 70847aee230b36116f6d3af682a5a68859860f7a..956e8d65aaec91c09c62c5f679376d55c7c719d6 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/radiobut.h"
 #include "wx/utils.h"
 

diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index 789220c16fa2e0350d8cb88574e91ccce58f31bf..5b19681cf389a3c095d49a802c4162fb09984cef 100644 (file)
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -12,7 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
 #include "wx/scrolbar.h"
 
 #ifdef __VMS__

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index d82e67f19c90439fd928e1bc3170935c3db04d6c..31ca0ae3e0cd51ed74821462a99ad87368c33064 100644 (file)
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        src/motif/slider.cpp
 // Purpose:     wxSlider
 // Author:      Julian Smart
 // Modified by:
@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_SLIDER
 
 #include "wx/slider.h"

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index 5276663d1e0cbc42057d2178cbd3779dcdf4c6ef..fcdc7ec4775e7bec6c0717a18d85515d3944bf7b 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index 77941b93fbe2e5987fef73c34d2b109a5e43b681..b22d663095d05cdcb73e03601fbc733f931fc6a7 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/motif/statbmp.cpp
 // Purpose:     wxStaticBitmap
 // Author:      Julian Smart
 // Modified by:
@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/statbmp.h"
 
 #ifdef __VMS__
@@ -131,7 +129,7 @@ void wxStaticBitmap::DoSetBitmap()
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
-    }    
+    }
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
@@ -156,4 +154,3 @@ void wxStaticBitmap::ChangeForegroundColour()
     m_bitmapCache.SetColoursChanged();
     wxWindow::ChangeForegroundColour();
 }
-

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 6c96295e52ed2859de3ff7a8c25373c93274ec83..744db4473144b9b8ca5e701da5d738a28c588ce2 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbox.cpp
+// Name:        src/motif/statbox.cpp
 // Purpose:     wxStaticBox
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/statbox.h"
 #include "wx/utils.h"
 
@@ -101,8 +99,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
             // XmNshadowType, XmSHADOW_IN,
             NULL);
 
-    bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ;
-    if (hasLabel)
+    if (!label.empty())
     {
         wxString label1(wxStripMenuCodes(label));
         wxXmString text(label1);
@@ -115,11 +112,11 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 #if wxCHECK_MOTIF_VERSION( 2, 0 )
                 XmNframeChildType, XmFRAME_TITLE_CHILD,
 #else
-                XmNchildType, XmFRAME_TITLE_CHILD,          
+                XmNchildType, XmFRAME_TITLE_CHILD,
 #endif
                 NULL);
     }
-    
+
     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
     ChangeBackgroundColour();
 

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 79d3ea330d7a0b61d2d7240da44b3522cbb358a7..953f4cd65943902a03f840f5fcbb544a53aa24a3 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.cpp
+// Name:        src/motif/stattext.cpp
 // Purpose:     wxStaticText
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index ef011a5056cb6e140e087dc82b23b38a477a35a8..81ac9740eaa80570dc3854ca46e17806ae6f24c2 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -24,8 +24,6 @@
 #define XtParent XTPARENT
 #endif
 
-#include "wx/defs.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -488,7 +486,7 @@ void wxTextCtrl::ShowPosition(long pos)
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);
-    return (int) str.Length();
+    return (int) str.length();
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const

diff --git a/src/msdos/mimetype.cpp b/src/msdos/mimetype.cpp
index 0665e79ab91982cd06027f4396c3b76fe37dd657..2966f22f658f7df30095a4a4f5f67b9a6023080b 100644 (file)
--- a/src/msdos/mimetype.cpp
+++ b/src/msdos/mimetype.cpp
@@ -13,22 +13,18 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
+#if wxUSE_MIMETYPE
 
 #ifndef WX_PRECOMP
-  #include "wx/string.h"
-  #if wxUSE_GUI
-    #include "wx/icon.h"
-  #endif
+    #include "wx/string.h"
+    #if wxUSE_GUI
+        #include "wx/icon.h"
+    #endif
 #endif //WX_PRECOMP
 
-#if wxUSE_MIMETYPE
-
 #include "wx/log.h"
 #include "wx/file.h"
 #include "wx/intl.h"

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index e1eea31a004a3c83f67c231bef1467d2ca06ae59..d425d89bc67c172df75d9bb62e0f29ef4b085050 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -26,7 +26,6 @@
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
-    #include "wx/defs.h"
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index e0917d615976007107c27c5aa207cf0efee6ca57..d0bcd12089a811e2dd7849a2c48e709f554daac7 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -27,7 +27,6 @@
 #if wxUSE_FONTDLG
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #endif

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 2c7a7e6bece0eb5aac938c76b5c1fedfdecdad95..655e9fcf672bb05dbe6da9fac39483a8296e01d5 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -24,12 +24,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_GAUGE
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
 #endif
 
-#if wxUSE_GAUGE
-
 #include "wx/gauge.h"
 #include "wx/msw/private.h"
 

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index cb69551e1a105f61c3688993c9137c7fb28ef8a1..3782a29354e8901a7c5f9b7ee603564a9e971017 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -17,11 +17,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/filefn.h"
-#include "wx/log.h"
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP \
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index e5739bad4f5e377e132e49a10ffda7b893636728..3b9ec5549d84da9ab2627df636da92446db22dc9 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -13,15 +13,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_HELP
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif
 
-#if wxUSE_HELP
-
 #include "wx/filefn.h"
 #include "wx/msw/helpwin.h"
 
@@ -53,14 +52,14 @@ bool wxWinHelpController::Initialize(const wxString& filename)
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
-    if (!file.IsEmpty())
+    if (!file.empty())
         m_helpFile = file;
     return true;
 }
 
 bool wxWinHelpController::DisplayContents(void)
 {
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString str = GetValidFilename(m_helpFile);
 
@@ -70,7 +69,7 @@ bool wxWinHelpController::DisplayContents(void)
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString str = GetValidFilename(m_helpFile);
 
@@ -79,7 +78,7 @@ bool wxWinHelpController::DisplaySection(int section)
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
 {
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString str = GetValidFilename(m_helpFile);
 
@@ -95,7 +94,7 @@ bool wxWinHelpController::DisplayBlock(long block)
 bool wxWinHelpController::KeywordSearch(const wxString& k,
                                         wxHelpSearchMode WXUNUSED(mode))
 {
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString str = GetValidFilename(m_helpFile);
 
@@ -115,7 +114,7 @@ wxString wxWinHelpController::GetValidFilename(const wxString& file) const
     wxSplitPath(file, & path, & name, & ext);
 
     wxString fullName;
-    if (path.IsEmpty())
+    if (path.empty())
         fullName = name + wxT(".hlp");
     else if (path.Last() == wxT('\\'))
         fullName = path + name + wxT(".hlp");

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index e0fa3ee5106a639595137bd26d507002a18bd49d..2b028056152f7b65f17a6b3882799fb5ad3429f8 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/icon.cpp
+// Name:        src/msw/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
@@ -151,4 +151,3 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }
-

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index edf1c114edc82133486d267b21d7d3dbc5d572ce..d641c6a3d5a832b6fff150a1717b2c6cc751741d 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
@@ -126,4 +125,3 @@ int wxMessageDialog::ShowModal()
     }
     return ans;
 }
-

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index a484b586560f26d29979dc410812579e3f2fe1f4..c2ee47cf6f888ee3f5ac85408f23528fb6a3c938 100644 (file)
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/mslu.cpp
+// Name:        src/msw/mslu.cpp
 // Purpose:     Fixes for bugs in MSLU
 // Author:      Vaclav Slavik
 // Modified by:
@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
-#include <dir.h>
+    #pragma hdrstop
+    #include <dir.h>
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/utils.h"
 #endif
 
@@ -223,7 +222,7 @@ WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
 }
 
 #ifdef __BORLANDC__
-//here _stati64 is defined as stati64, see msw/mslu.h line 62 
+//here _stati64 is defined as stati64, see msw/mslu.h line 62
 #undef _stati64
 WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer)
  {

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 6096c4cf78abc696a30c222901912a27691cd5fc..548ac661a80955cc789268c98b7c2335a9d3a094 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -13,11 +13,9 @@
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 // Watcom C++ gives a linker error if this is compiled in.
 // With Borland C++, all samples crash if this is compiled in.
 #if wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
@@ -595,11 +593,11 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
     {
         wxDateTime date( variant.GetDateTime() );
         oleVariant.vt = VT_DATE;
-        
+
         long dosDateTime = date.GetAsDOS();
         short dosDate = short((dosDateTime & 0xFFFF0000) >> 16);
         short dosTime = short(dosDateTime & 0xFFFF);
-        
+
         DosDateTimeToVariantTime(dosDate, dosTime, & oleVariant.date);
     }
 #endif
@@ -682,7 +680,7 @@ WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant&
             unsigned short dosDate = 0;
             unsigned short dosTime = 0;
             VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
-            
+
             long dosDateTime = (dosDate << 16) || dosTime;
             wxDateTime date;
             date.SetFromDOS(dosDateTime);

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index b4586d291b83598e7115b9e37ad3b1755160bf01..d28e3cdfa616d8a38e08caebf3c82b08eda20954 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/popupwin.cpp
+// Name:        src/msw/popupwin.cpp
 // Purpose:     implements wxPopupWindow for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -24,12 +24,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_POPUPWIN
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif //WX_PRECOMP
 
-#if wxUSE_POPUPWIN
-
 #include "wx/popupwin.h"
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
@@ -112,4 +111,3 @@ bool wxPopupWindow::Show(bool show)
 }
 
 #endif // #if wxUSE_POPUPWIN
-

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index dd37d4f050966284b02269132602ad3f39504784..a8e3297d5ae87c6b6ee0907dae0c2270975ca03a 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printwin.cpp
+// Name:        src/msw/printwin.cpp
 // Purpose:     wxWindowsPrinter framework
 // Author:      Julian Smart
 // Modified by:
@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 // Don't use the Windows printer if we're in wxUniv mode and using
 // the PostScript architecture
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index c5b9b9b5c1bd0c5b3d746b1f7804222676eeaffe..ec0f9b717bb71a8f9b7dbb20323809152aa5aec1 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -14,15 +14,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/window.h"
-#include "wx/frame.h"
-#include "wx/utils.h"
-#include "wx/menu.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+    #include "wx/utils.h"
+    #include "wx/menu.h"
 #endif
 
 #include "wx/msw/private.h"

diff --git a/src/msw/wince/filefnwce.cpp b/src/msw/wince/filefnwce.cpp
index c9bce9c17dff9dda2fd432723c40eb86c0f97a71..61827f0f6d6a58378334a1db8e45dd03215efe74 100644 (file)
--- a/src/msw/wince/filefnwce.cpp
+++ b/src/msw/wince/filefnwce.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filefn.cpp
+// Name:        src/msw/wince/filefn.cpp
 // Purpose:     File- and directory-related functions
 // Author:      Julian Smart
 // Modified by:
@@ -19,13 +19,13 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include "wx/defs.h"
-#include "wx/file.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#include "wx/file.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -123,12 +123,12 @@ int wxEof(int fd)
     DWORD off0 = SetFilePointer((HANDLE) fd, 0, &high0, FILE_CURRENT);
     if (off0 == 0xFFFFFFFF && GetLastError() != NO_ERROR)
         return -1;
-    
+
     LONG high1 = 0;
     DWORD off1 = SetFilePointer((HANDLE) fd, 0, &high0, FILE_END);
     if (off1 == 0xFFFFFFFF && GetLastError() != NO_ERROR)
         return -1;
-    
+
     if (off0 == off1 && high0 == high1)
         return 1;
     else

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index c97801ef8573dbcbef6728f6bda1dadb666a4072..5e86909cb97d724c22f42492c3c5a6008b7267c1 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/os2/combobox.cpp
 // Purpose:     wxComboBox class
 // Author:      David Webster
 // Modified by:
@@ -12,13 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_COMBOBOX
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/settings.h"
 #endif
 
-#if wxUSE_COMBOBOX
-
 #include "wx/combobox.h"
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index 137101f053e664958bebd49f2f6e21411b88c2ff..3dfd2b17e5a1ebc14580f2d1752cde35f246a743 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -20,14 +20,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_DATAOBJ
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif
 
-#if wxUSE_DATAOBJ
-
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

diff --git a/src/os2/dirdlg.cpp b/src/os2/dirdlg.cpp
index 915fda9f91b110f4e7a88712242bd6994d255fea..28af822197b86415b87df867a2f0e69707528a7d 100644 (file)
--- a/src/os2/dirdlg.cpp
+++ b/src/os2/dirdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dirdlg.cpp
+// Name:        src/os2/dirdlg.cpp
 // Purpose:     wxDirDialog
 // Author:      David Webster
 // Modified by:
@@ -13,11 +13,10 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/dirdlg.h"
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/dirdlg.h"
 #endif
 
 #include "wx/os2/private.h"
@@ -46,4 +45,3 @@ int wxDirDialog::ShowModal()
     // TODO
     return wxID_CANCEL;
 }
-

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index ca3bb8fd671e308ceb0f2e3f63e0848d52606bf9..a4284a5e66d74b92213a373a66ef203612f2d589 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlg.cpp
+// Name:        src/os2/fontdlg.cpp
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      David Webster
@@ -14,11 +14,10 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/math.h"
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/math.h"
 #endif
 
 #include "wx/fontdlg.h"
@@ -98,4 +97,3 @@ int wxFontDialog::ShowModal()
     }
     return wxID_CANCEL;
 } // end of wxFontDialg::ShowModal
-

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index e7b33f782911d20c4aac7b6c049553264e365501..f8c4e9d11aa7f7d911f930c2217749634e83779f 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -13,7 +13,6 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/object.h"
     #include "wx/dynarray.h"
     #include "wx/list.h"

diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index 972246d597264d076c98d27c67d3de6cd30ab49f..2bf1c242ebca162c74f4a3590bb13e7912fe9717 100644 (file)
--- a/src/os2/gauge.cpp
+++ b/src/os2/gauge.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.cpp
+// Name:        src/os2/gauge.cpp
 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:
@@ -12,9 +12,8 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/scrolwin.h"
+    #include "wx/utils.h"
+    #include "wx/scrolwin.h"
 #endif
 
 #include "wx/os2/private.h"
@@ -241,12 +240,10 @@ int wxGauge::GetValue() const
     return m_nGaugePos;
 } // end of wxGauge::GetValue
 
-bool wxGauge::SetBackgroundColour(
-  const wxColour&                   rColour
-)
+bool wxGauge::SetBackgroundColour( const wxColour& rColour )
 {
     if (!wxControl::SetBackgroundColour(rColour))
-        return FALSE;
+        return false;
 
     LONG                            lColor = (LONG)rColour.GetPixel();
 
@@ -255,7 +252,7 @@ bool wxGauge::SetBackgroundColour(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
-    return TRUE;
+    return true;
 } // end of wxGauge::SetBackgroundColour
 
 void wxGauge::SetBezelFace(
@@ -264,14 +261,12 @@ void wxGauge::SetBezelFace(
 {
 } // end of wxGauge::SetBezelFace
 
-bool wxGauge::SetForegroundColour(
-  const wxColour&                   rColour
-)
+bool wxGauge::SetForegroundColour( const wxColour& rColour )
 {
     if (!wxControl::SetForegroundColour(rColour))
-        return FALSE;
+        return false;
 
-    LONG                            lColor = (LONG)rColour.GetPixel();
+    LONG lColor = (LONG)rColour.GetPixel();
 
     ::WinSetPresParam( GetHwnd()
                       ,PP_FOREGROUNDCOLOR
@@ -279,7 +274,7 @@ bool wxGauge::SetForegroundColour(
                       ,(PVOID)&lColor
                      );
 
-    return TRUE;
+    return true;
 } // end of wxGauge::SetForegroundColour
 
 void wxGauge::SetRange(

diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp
index 4258e637cf0c7bdc11875ac91577bfcbf23171a8..c0281d2ac1d36dca240ee2b9475ca47e6777e079 100644 (file)
--- a/src/os2/gsockpm.cpp
+++ b/src/os2/gsockpm.cpp
@@ -9,8 +9,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_SOCKETS
 
 #include <stdlib.h>

diff --git a/src/os2/helpwin.cpp b/src/os2/helpwin.cpp
index 19c6c00e4a924c279c8b6c41b0d56877c912b800..dacf83e5249621dc793114c7d77116aca35029e4 100644 (file)
--- a/src/os2/helpwin.cpp
+++ b/src/os2/helpwin.cpp
@@ -12,13 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_HELP
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif
 
 #include "wx/os2/helpwin.h"
 
-#if wxUSE_HELP
 #include <time.h>
 
 #include "wx/os2/private.h"
@@ -150,4 +150,5 @@ bool wxWinHelpController::Quit()
 void wxWinHelpController::OnQuit()
 {
 }
+
 #endif // wxUSE_HELP

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index a7a27c525f0eb9a7540cd9b0bc4651ba700088c5..a8d7100033d17c2f49f36aa528498d85f5a41a42 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -13,11 +13,10 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 7d9ec64512197a9fa4fe0b7316af68b6a64d7f20..6fef9a01160ea1cf1cf1eb5e3cfa9df056649fee 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -14,8 +14,6 @@
 //
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_JOYSTICK
 
 #include "wx/string.h"

diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp
index 0826f701b02a5031ab42272bc6e1e59cf1673517..7577e564ec2b1b004786c12f527583d4057cfb5e 100644 (file)
--- a/src/os2/msgdlg.cpp
+++ b/src/os2/msgdlg.cpp
@@ -13,13 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/app.h"
-#include "wx/msgdlg.h"
-#include "wx/math.h"
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/app.h"
+    #include "wx/msgdlg.h"
+    #include "wx/math.h"
 #endif
 
 #include "wx/os2/private.h"

diff --git a/src/os2/palette.cpp b/src/os2/palette.cpp
index 76e68ed2f06487679f32e3dd5107f47309b24eb0..a579c53803122338fef80136aee09b46b0b5000f 100644 (file)
--- a/src/os2/palette.cpp
+++ b/src/os2/palette.cpp
@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/os2/private.h"
-#include "wx/palette.h"
-#include "wx/app.h"
+    #include <stdio.h>
+    #include "wx/string.h"
+    #include "wx/os2/private.h"
+    #include "wx/palette.h"
+    #include "wx/app.h"
 #endif
 
 #define INCL_PM

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index c75d66794f8cb7252152cd20c5054fc450be7011..805e567da7c3a9687ff7765237c94c7e79224f56 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -13,11 +13,10 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/gdicmn.h"
+    #include <stdio.h>
+    #include "wx/pen.h"
+    #include "wx/brush.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/module.h"

diff --git a/src/palmos/colordlg.cpp b/src/palmos/colordlg.cpp
index 3bcf27d4e64b0c8abaed99c503792c57545d9279..d2edc5154bbaad6cec0231e7be28106ce8b1d858 100644 (file)
--- a/src/palmos/colordlg.cpp
+++ b/src/palmos/colordlg.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/intl.h"
 #endif
 

diff --git a/src/palmos/fontdlg.cpp b/src/palmos/fontdlg.cpp
index f1e6ec5d935089cd8a4b9e656049c5cd92a11d42..e6c238f90ee30ec9610918dea2e29724ad4ff724 100644 (file)
--- a/src/palmos/fontdlg.cpp
+++ b/src/palmos/fontdlg.cpp
@@ -27,7 +27,6 @@
 #if wxUSE_FONTDLG
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/math.h"

diff --git a/src/palmos/gauge.cpp b/src/palmos/gauge.cpp
index 157c7b9294f01982c0d87384052463f2d66613c3..f0c47e387829915ee77c3ad81cb9c7c2a67975b3 100644 (file)
--- a/src/palmos/gauge.cpp
+++ b/src/palmos/gauge.cpp
@@ -24,12 +24,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_GAUGE
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
 #endif
 
-#if wxUSE_GAUGE
-
 #include "wx/gauge.h"
 #include "wx/palmos/private.h"
 

diff --git a/src/palmos/help.cpp b/src/palmos/help.cpp
index 40d91a484ea86625cd2479b0d95be40a4941d517..5fee68e8402d0198d8c6ef3fb70b799525c1bce0 100644 (file)
--- a/src/palmos/help.cpp
+++ b/src/palmos/help.cpp
@@ -16,12 +16,11 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_HELP
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif
 
-#if wxUSE_HELP
-
 #include "wx/filefn.h"
 
 #include <time.h>

diff --git a/src/palmos/icon.cpp b/src/palmos/icon.cpp
index 853931bafda4186bd86ab14e386caa14f49eab5f..98af07bc4128d1687103c6fd615e8534c7c0c100 100644 (file)
--- a/src/palmos/icon.cpp
+++ b/src/palmos/icon.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
@@ -90,4 +89,3 @@ bool wxIcon::LoadFile(const wxString& filename,
 {
     return false;
 }
-

diff --git a/src/palmos/msgdlg.cpp b/src/palmos/msgdlg.cpp
index 12c15eb45f5ac22276dc73e379fac3275f2b9916..4c1f7732b5043df2e1b52ed089f63613824ffd40 100644 (file)
--- a/src/palmos/msgdlg.cpp
+++ b/src/palmos/msgdlg.cpp
@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
@@ -149,4 +148,3 @@ int wxMessageDialog::ShowModal()
 
     return wxResult;
 }
-

diff --git a/src/palmos/popupwin.cpp b/src/palmos/popupwin.cpp
index 770436845f8be3f27f80b6a800c9dc52a7cd630e..009f37eaa5578a83d0923ec40aeac63f9656cecc 100644 (file)
--- a/src/palmos/popupwin.cpp
+++ b/src/palmos/popupwin.cpp
@@ -24,12 +24,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_POPUPWIN
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif //WX_PRECOMP
 
-#if wxUSE_POPUPWIN
-
 #include "wx/popupwin.h"
 
 #include "wx/palmos/private.h"     // for GetDesktopWindow()
@@ -65,4 +64,3 @@ bool wxPopupWindow::Show(bool show)
 }
 
 #endif // #if wxUSE_POPUPWIN
-

diff --git a/src/palmos/printpalm.cpp b/src/palmos/printpalm.cpp
index 22779980fc8a3191556b38698ef3cf16e24ac10e..1ff991aa299fa3c7e40535eba24f1708691a461e 100644 (file)
--- a/src/palmos/printpalm.cpp
+++ b/src/palmos/printpalm.cpp
@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 // Don't use the Windows printer if we're in wxUniv mode and using
 // the PostScript architecture
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)

diff --git a/src/palmos/taskbar.cpp b/src/palmos/taskbar.cpp
index c6e8d52f8fc1c8fc47753c4ebaa0a8a6e954e503..8ab4274bb257b6a7a435cc5a1f522a5a7dbef5ae 100644 (file)
--- a/src/palmos/taskbar.cpp
+++ b/src/palmos/taskbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// File:        taskbar.cpp
+// File:        src/palmos/taskbar.cpp
 // Purpose:     Implements wxTaskBarIcon class for manipulating icons on
 //              the task bar.
 // Author:      Julian Smart
@@ -14,15 +14,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/window.h"
-#include "wx/frame.h"
-#include "wx/utils.h"
-#include "wx/menu.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+    #include "wx/utils.h"
+    #include "wx/menu.h"
 #endif
 
 #if defined(__WIN95__)
@@ -107,4 +106,3 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
 }
 
 #endif // __WIN95__
-

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index e9d916a0625ea441181732368cda19a3f9405404..591584644c586e9fcfd1f9c25b34b13561522dbe 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -15,10 +15,9 @@
 #if wxUSE_DIALUP_MANAGER
 
 #ifndef  WX_PRECOMP
-#   include "wx/defs.h"
+    #include "wx/string.h"
 #endif // !PCH
 
-#include "wx/string.h"
 #include "wx/event.h"
 #include "wx/dialup.h"
 #include "wx/timer.h"

diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp
index 92e36ad5d795372fed3f81769b006cfda067bace..c60b06b7589a3f9ea3af86c326d40706f5832e3a 100644 (file)
--- a/src/unix/joystick.cpp
+++ b/src/unix/joystick.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.cpp
+// Name:        src/unix/joystick.cpp
 // Purpose:     wxJoystick class
 // Author:      Ported to Linux by Guilhem Lavaux
 // Modified by:
@@ -12,8 +12,6 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_JOYSTICK
 
 #include "wx/joystick.h"
@@ -188,7 +186,7 @@ wxJoystick::wxJoystick(int joystick)
     if (m_device == -1)
     {
         dev_name.Printf( wxT("/dev/input/js%d"), joystick);
-        m_device = open(dev_name.fn_str(), O_RDONLY);             
+        m_device = open(dev_name.fn_str(), O_RDONLY);
     }
 
     if (m_device != -1)
@@ -295,7 +293,7 @@ int wxJoystick::GetNumberJoysticks()
             break;
         close(fd);
     }
-    
+
     if (j == 0) {
         for (j=0; j<4; j++) {
             dev_name.Printf(wxT("/dev/input/js%d"), j);
@@ -305,7 +303,7 @@ int wxJoystick::GetNumberJoysticks()
             close(fd);
         }
     }
-    
+
     return j;
 }
 
@@ -489,4 +487,3 @@ bool wxJoystick::ReleaseCapture()
     return false;
 }
 #endif  // wxUSE_JOYSTICK
-

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 0a2793f92c6b8e9ed8d677865fd5a29969dfc15a..c39e2545456ed9d53989e86b7f3759c6d58f6e16 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        unix/mimetype.cpp
+// Name:        src/unix/mimetype.cpp
 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -33,17 +33,13 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
+    #pragma hdrstop
 #endif
 
 #if wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE
 
 #ifndef WX_PRECOMP
-  #include "wx/string.h"
+    #include "wx/string.h"
 #endif
 
 #include "wx/log.h"
@@ -311,7 +307,7 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
 
             wxLogTrace(TRACE_MIME, wxT("--- Reading from Gnome file %s '%s' ---"),
                     filename.c_str(), pc);
-            
+
             // trim trailing space and tab
             while ((*pc == wxT(' ')) || (*pc == wxT('\t')))
                 pc++;
@@ -322,18 +318,18 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
             {
                 wxString left_of_equal = sTmp.Left( equal_pos );
                 const wxChar *right_of_equal = pc;
-                right_of_equal += equal_pos+1; 
-                
+                right_of_equal += equal_pos+1;
+
                 if (left_of_equal == wxT("icon_filename"))
                 {
                     // GNOME 2:
                     curIconFile = right_of_equal;
-                    
+
                     wxFileName newFile( curIconFile );
                     if (newFile.IsRelative() || newFile.FileExists())
                     {
                         size_t nDirs = search_dirs.GetCount();
-                        
+
                         for (size_t nDir = 0; nDir < nDirs; nDir++)
                         {
                             newFile.SetPath( search_dirs[nDir] );
@@ -1309,7 +1305,7 @@ void wxMimeTypesManagerImpl::InitIfNeeded()
     {
         // set the flag first to prevent recursion
         m_initialized = true;
-    
+
     wxString wm = wxGetenv( wxT("WINDOWMANAGER") );
 
     if (wm.Find( wxT("kde") ) != wxNOT_FOUND)
@@ -1764,7 +1760,7 @@ bool wxMimeTypesManagerImpl::DoAssociation(const wxString& strType,
                                            const wxString& strDesc)
 {
     int nIndex = AddToMimeData(strType, strIcon, entry, strExtensions, strDesc, true);
-    
+
     if ( nIndex == wxNOT_FOUND )
         return false;
 
@@ -2703,4 +2699,3 @@ static bool IsKnownUnimportantField(const wxString& fieldAll)
 
 #endif
   // wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE
-

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 43c51fdf1cd8a55c2406d19134cbc815548ebb62..02b49fdc575bae5541ff2686e99940cfb8fea8c3 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        unix/utilsunx.cpp
+// Name:        src/unix/utilsunx.cpp
 // Purpose:     generic Unix implementation of many wx functions
 // Author:      Vadim Zeitlin
 // Id:          $Id$
@@ -18,8 +18,9 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-#include "wx/string.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
 
 #include "wx/intl.h"
 #include "wx/log.h"
@@ -280,7 +281,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
     // split the command line in arguments
     do
     {
-        argument=wxT("");
+        argument = wxEmptyString;
         quotechar = wxT('\0');
 
         // eat leading whitespace:
@@ -884,7 +885,7 @@ wxString wxGetOsDescription()
         return wxString::FromAscii( buf );
     }
     wxFAIL_MSG( _T("uname failed") );
-    return _T("");
+    return wxEmptyString;
 }
 
 #endif // !__WXMAC__

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index fadc4afd80ed4a5a1f7e20eb254115c2e5832ac3..4fee19a52756f6b2d9c5da54d8358679beaf1faa 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dataobj.cpp
+// Name:        src/x11/dataobj.cpp
 // Purpose:     wxDataObject class
 // Author:      Julian Smart
 // Id:          $Id$
@@ -7,7 +7,8 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_DATAOBJ
 
@@ -101,7 +102,7 @@ wxString wxDataFormat::GetId() const
 #else
     char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
     wxString ret = wxString::FromAscii( t );
-    if (t) 
+    if (t)
         XFree( t );
     return ret;
 #endif
@@ -130,7 +131,7 @@ void wxDataFormat::SetId( const wxChar *id )
     PrepareFormats();
     m_type = wxDF_PRIVATE;
     wxString tmp( id );
-    m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE ); 
+    m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE );
 #endif
 }
 
@@ -157,17 +158,17 @@ wxDataObject::wxDataObject()
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);
-    if ( nFormatCount == 1 ) 
+    if ( nFormatCount == 1 )
     {
         return format == GetPreferredFormat();
     }
-    else 
+    else
     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;
-        for ( n = 0; n < nFormatCount; n++ ) 
+        for ( n = 0; n < nFormatCount; n++ )
         {
             if ( formats[n] == format )
                 break;
@@ -196,7 +197,7 @@ bool wxFileDataObject::GetDataHere(void *buf) const
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
 
-    return TRUE;
+    return true;
 }
 
 size_t wxFileDataObject::GetDataSize() const
@@ -278,7 +279,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
     }
 #endif // 0/1
 
-    return TRUE;
+    return true;
 }
 
 void wxFileDataObject::AddFile( const wxString &filename )
@@ -323,12 +324,12 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 
-        return FALSE;
+        return false;
     }
 
     memcpy(buf, m_pngData, m_pngSize);
 
-    return TRUE;
+    return true;
 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)
@@ -346,14 +347,14 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     wxPNGHandler handler;
     if ( !handler.LoadFile( &image, mstream ) )
     {
-        return FALSE;
+        return false;
     }
 
     m_bitmap = image;
 
     return m_bitmap.Ok();
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -378,4 +379,3 @@ void wxBitmapDataObject::DoConvertToPng()
 }
 
 #endif // wxUSE_DATAOBJ
-

diff --git a/src/x11/dc.cpp b/src/x11/dc.cpp
index f36c6febaf3c3f8d686cbcb315ec27af2abdcc09..e3f513a14307d62d8a851660d23007aa95c64235 100644 (file)
--- a/src/x11/dc.cpp
+++ b/src/x11/dc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dc.cpp
+// Name:        src/x11/dc.cpp
 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:
@@ -9,9 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/dc.h"
 #include "wx/dcmemory.h"
-#include "wx/defs.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
@@ -21,7 +23,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 wxDC::wxDC()
 {
-    m_ok = FALSE;
+    m_ok = false;
 
 #if 1
     m_mm_to_pix_x = 1.0;
@@ -33,8 +35,8 @@ wxDC::wxDC()
                     (double)wxGetDisplaySizeMM().GetHeight();
 #endif
 
-    m_needComputeScaleX = FALSE; /* not used yet */
-    m_needComputeScaleY = FALSE; /* not used yet */
+    m_needComputeScaleX = false; /* not used yet */
+    m_needComputeScaleY = false; /* not used yet */
 
     m_logicalFunction = wxCOPY;
 
@@ -44,12 +46,12 @@ wxDC::wxDC()
 
     m_backgroundMode = wxTRANSPARENT;
 
-    m_isInteractive = FALSE;  // ???
+    m_isInteractive = false;  // ???
 }
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
-    m_clipping = TRUE;
+    m_clipping = true;
     m_clipX1 = x;
     m_clipY1 = y;
     m_clipX2 = x + width;
@@ -97,8 +99,8 @@ void wxDC::SetMapMode( int mode )
     }
     if (mode != wxMM_TEXT)
     {
-        m_needComputeScaleX = TRUE;
-        m_needComputeScaleY = TRUE;
+        m_needComputeScaleX = true;
+        m_needComputeScaleY = true;
     }
 }
 
@@ -185,4 +187,3 @@ void wxDC::ComputeScaleAndOrigin()
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 }
-

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 08742ac42ef3439f0839ba4cf9146d5b2762705b..f982eb15fe54090b553495eddd116d2108d0e116 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -26,7 +29,6 @@
 #pragma message enable nosimpint
 #endif
 
-#include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
@@ -95,7 +97,7 @@ public:
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,
-                  bool underlined = FALSE,
+                  bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
@@ -118,7 +120,7 @@ public:
     void SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);
 
-    void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
+    void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }
     bool GetNoAntiAliasing() const { return m_noAA; }
 
     // and this one also modifies all the other font data fields
@@ -213,7 +215,7 @@ void wxFontRefData::Init(int pointSize,
 
 void wxFontRefData::InitFromNative()
 {
-    m_noAA = FALSE;
+    m_noAA = false;
 
 #if wxUSE_UNICODE
     // Get native info
@@ -273,7 +275,7 @@ void wxFontRefData::InitFromNative()
     }
 
     // Pango description are never underlined (?)
-    m_underlined = FALSE;
+    m_underlined = false;
 
     // Cannot we choose that
     m_encoding = wxFONTENCODING_SYSTEM;
@@ -343,7 +345,7 @@ void wxFontRefData::InitFromNative()
     }
 
     // X fonts are never underlined...
-    m_underlined = FALSE;
+    m_underlined = false;
 
     // deal with font encoding
     wxString
@@ -550,7 +552,7 @@ bool wxFont::Create(int pointSize,
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);
 
-    return TRUE;
+    return true;
 }
 
 #if !wxUSE_UNICODE
@@ -560,7 +562,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
-        return TRUE;
+        return true;
     }
 
     m_refData = new wxFontRefData();
@@ -653,9 +655,9 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
         }
         //else: unknown encoding - may be give a warning here?
         else
-            return FALSE;
+            return false;
     }
-    return TRUE;
+    return true;
 }
 #endif // !wxUSE_UNICODE
 
@@ -695,7 +697,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
     return M_FONTDATA->m_faceName;
 }
@@ -723,7 +725,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
     return M_FONTDATA->m_underlined;
 }
@@ -757,13 +759,13 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 
 bool wxFont::IsFixedWidth() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
 #if wxUSE_UNICODE
    return wxFontBase::IsFixedWidth();
 #else
     // Robert, is this right? HasNativeFont doesn't exist.
-    if ( TRUE )
+    if ( true )
     //    if ( M_FONTDATA->HasNativeFont() )
     {
         // the monospace fonts are supposed to have "M" in the spacing field
@@ -877,7 +879,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     if (xFontName == "-*-*-*-*-*--*-*-*-*-*-*-*-*")
       // wxFont constructor not called with native font info parameter => take M_FONTDATA values
       xFontName.Clear();
-    
+
     // not found, create a new one
     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,

diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 45b3a278c6a15d35758b98a6a634cb3d98665cf1..125130fcd262fad23fba9d1605abf088695123cf 100644 (file)
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.cpp
+// Name:        srx/x11/popupwin.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,11 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
-#include "wx/log.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_POPUPWIN
 
+#include "wx/log.h"
+
 #include "wx/popupwin.h"
 #include "wx/app.h"
 #include "wx/settings.h"
@@ -36,13 +38,13 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
-        return FALSE;
+        return false;
     }
 
     // All dialogs should really have this style
     m_windowStyle = style;
     m_windowStyle |= wxTAB_TRAVERSAL;
-    
+
     wxPoint pos( 20,20 );
     wxSize size( 20,20 );
     wxPoint pos2 = pos;
@@ -56,74 +58,74 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );
     Colormap cm = DefaultColormap( xdisplay, xscreen);
-    
+
 #if wxUSE_TWO_WINDOWS
-    bool need_two_windows = 
+    bool need_two_windows =
         ((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
 #else
-    bool need_two_windows = FALSE;
+    bool need_two_windows = false;
 #endif
 
 #if wxUSE_NANOX
     long xattributes_mask = 0;
 #else
-    
+
     XSetWindowAttributes xattributes;
     long xattributes_mask = 0;
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     m_backgroundColour.CalcPixel( (WXColormap) cm);
-    
+
     m_foregroundColour = *wxBLACK;
     m_foregroundColour.CalcPixel( (WXColormap) cm);
-    
+
     xattributes_mask |= CWBackPixel;
     xattributes.background_pixel = m_backgroundColour.GetPixel();
-    
+
     xattributes_mask |= CWBorderPixel;
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
-    
+
     xattributes_mask |= CWOverrideRedirect | CWSaveUnder;
     xattributes.override_redirect = True;
     xattributes.save_under = True;
-    
+
     xattributes_mask |= CWEventMask;
 #endif
-    
+
     if (need_two_windows)
     {
 #if !wxUSE_NANOX
-        xattributes.event_mask = 
+        xattributes.event_mask =
             ExposureMask | StructureNotifyMask | ColormapChangeMask;
 #endif
-        
-        Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, 
+
+        Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y,
             0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
 
-#if wxUSE_NANOX    
+#if wxUSE_NANOX
         XSelectInput( xdisplay, xwindow,
           ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
           ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
           KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
           PropertyChangeMask );
 #endif
-    
+
         // Set background to None which will prevent X11 from clearing the
         // background comletely.
         XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
-    
+
         m_mainWindow = (WXWindow) xwindow;
         wxAddWindowToTable( xwindow, (wxWindow*) this );
-        
+
         // XMapWindow( xdisplay, xwindow );
-#if !wxUSE_NANOX    
-        xattributes.event_mask = 
+#if !wxUSE_NANOX
+        xattributes.event_mask =
             ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
             ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
             KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
             PropertyChangeMask | VisibilityChangeMask ;
 #endif
-        
+
         if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
         {
             pos2.x = 2;
@@ -142,40 +144,40 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
             pos2.x = 0;
             pos2.y = 0;
         }
-        
-        xwindow = XCreateWindow( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y, 
+
+        xwindow = XCreateWindow( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y,
             0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
-    
+
         // Set background to None which will prevent X11 from clearing the
         // background comletely.
         XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
-    
-#if wxUSE_NANOX    
+
+#if wxUSE_NANOX
         XSelectInput( xdisplay, xwindow,
             ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
             ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
             KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
             PropertyChangeMask );
 #endif
-    
+
         m_clientWindow = (WXWindow) xwindow;
         wxAddClientWindowToTable( xwindow, (wxWindow*) this );
-        
-        m_isShown = FALSE;
+
+        m_isShown = false;
         XMapWindow( xdisplay, xwindow );
     }
     else
     {
         // One window
 #if !wxUSE_NANOX
-        xattributes.event_mask = 
+        xattributes.event_mask =
             ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
             ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
             KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
             PropertyChangeMask | VisibilityChangeMask ;
 #endif
-        
-        Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, 
+
+        Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y,
             0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
 
 #if wxUSE_NANOX
@@ -185,16 +187,16 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
           KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
           PropertyChangeMask );
 #endif
-        
+
         // Set background to None which will prevent X11 from clearing the
         // background comletely.
         XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
-    
+
         m_mainWindow = (WXWindow) xwindow;
         m_clientWindow = (WXWindow) xwindow;
         wxAddWindowToTable( xwindow, (wxWindow*) this );
-        
-        m_isShown = FALSE;
+
+        m_isShown = false;
         // XMapWindow( xdisplay, xwindow );
     }
 
@@ -210,8 +212,8 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     wm_hints.initial_state = NormalState;
     XSetWMHints( xdisplay, (Window) m_mainWindow, &wm_hints);
 #endif
-    
-    return TRUE;
+
+    return true;
 }
 
 void wxPopupWindow::DoMoveWindow(int x, int y, int width, int height )
@@ -229,7 +231,7 @@ bool wxPopupWindow::Show( bool show )
     bool ret = wxWindowX11::Show( show );
 
     Raise();
-    
+
     return ret;
 }