use #if WXWIN_COMPAT and not #ifdef (patch 826160)

[wxWidgets.git] / include / wx / window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 3de333b04eeaf91969ef65586c24679e0c5d4873..b17fcf0e7f8cde44096776c7fa86d4923fe94785 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -119,17 +119,17 @@ public:
     // deleting the window
     // -------------------
 
     // deleting the window
     // -------------------
 

-        // ask the window to close itself, return TRUE if the event handler
+        // ask the window to close itself, return true if the event handler

         // honoured our request
         // honoured our request

-    bool Close( bool force = FALSE );
+    bool Close( bool force = false );

 
         // the following functions delete the C++ objects (the window itself
         // or its children) as well as the GUI windows and normally should
         // never be used directly
 
 
         // the following functions delete the C++ objects (the window itself
         // or its children) as well as the GUI windows and normally should
         // never be used directly
 

-        // delete window unconditionally (dangerous!), returns TRUE if ok
+        // delete window unconditionally (dangerous!), returns true if ok

     virtual bool Destroy();
     virtual bool Destroy();

-        // delete all children of this window, returns TRUE if ok
+        // delete all children of this window, returns true if ok

     bool DestroyChildren();
 
         // is the window being deleted?
     bool DestroyChildren();
 
         // is the window being deleted?


@@ -219,7 +219,7 @@ public:
         return wxPoint(w, h);
     }
 
         return wxPoint(w, h);
     }
 

-       void SetPosition( const wxPoint& pt ) { Move( pt ) ; }
+    void SetPosition( const wxPoint& pt ) { Move( pt ) ; }

 
     void GetSize( int *w, int *h ) const { DoGetSize(w, h); }
     wxSize GetSize() const
 
     void GetSize( int *w, int *h ) const { DoGetSize(w, h); }
     wxSize GetSize() const


@@ -358,14 +358,14 @@ public:
     // window state
     // ------------
 
     // window state
     // ------------
 

-        // returns TRUE if window was shown/hidden, FALSE if the nothing was
+        // returns true if window was shown/hidden, false if the nothing was

         // done (window was already shown/hidden)
         // done (window was already shown/hidden)

-    virtual bool Show( bool show = TRUE );
-    bool Hide() { return Show(FALSE); }
+    virtual bool Show( bool show = true );
+    bool Hide() { return Show(false); }

 
 

-        // returns TRUE if window was enabled/disabled, FALSE if nothing done
-    virtual bool Enable( bool enable = TRUE );
-    bool Disable() { return Enable(FALSE); }
+        // returns true if window was enabled/disabled, false if nothing done
+    virtual bool Enable( bool enable = true );
+    bool Disable() { return Enable(false); }

 
     bool IsShown() const { return m_isShown; }
     bool IsEnabled() const { return m_isEnabled; }
 
     bool IsShown() const { return m_isShown; }
     bool IsEnabled() const { return m_isEnabled; }


@@ -388,11 +388,16 @@ public:
     long GetExtraStyle() const { return m_exStyle; }
 
         // make the window modal (all other windows unresponsive)
     long GetExtraStyle() const { return m_exStyle; }
 
         // make the window modal (all other windows unresponsive)

-    virtual void MakeModal(bool modal = TRUE);
+    virtual void MakeModal(bool modal = true);

 
     virtual void SetThemeEnabled(bool enableTheme) { m_themeEnabled = enableTheme; }
     virtual bool GetThemeEnabled() const { return m_themeEnabled; }
 
 
     virtual void SetThemeEnabled(bool enableTheme) { m_themeEnabled = enableTheme; }
     virtual bool GetThemeEnabled() const { return m_themeEnabled; }
 

+        // returns true if this window should inherit its parent colours on
+        // creation
+    virtual bool ShouldInheritColours() const { return false; }
+
+

     // focus and keyboard handling
     // ---------------------------
 
     // focus and keyboard handling
     // ---------------------------
 


@@ -434,6 +439,9 @@ public:
     const wxWindowList& GetChildren() const { return m_children; }
     wxWindowList& GetChildren() { return m_children; }
 
     const wxWindowList& GetChildren() const { return m_children; }
     wxWindowList& GetChildren() { return m_children; }
 

+    // needed just for extended runtime
+    const wxWindowList& GetWindowChildren() const { return GetChildren() ; }
+

         // get the parent or the parent of the parent
     wxWindow *GetParent() const { return m_parent; }
     inline wxWindow *GetGrandParent() const;
         // get the parent or the parent of the parent
     wxWindow *GetParent() const { return m_parent; }
     inline wxWindow *GetGrandParent() const;


@@ -443,8 +451,8 @@ public:
 
         // it doesn't really change parent, use ReParent() instead
     void SetParent( wxWindowBase *parent ) { m_parent = (wxWindow *)parent; }
 
         // it doesn't really change parent, use ReParent() instead
     void SetParent( wxWindowBase *parent ) { m_parent = (wxWindow *)parent; }

-        // change the real parent of this window, return TRUE if the parent
-        // was changed, FALSE otherwise (error or newParent == oldParent)
+        // change the real parent of this window, return true if the parent
+        // was changed, false otherwise (error or newParent == oldParent)

     virtual bool Reparent( wxWindowBase *newParent );
 
         // implementation mostly
     virtual bool Reparent( wxWindowBase *newParent );
 
         // implementation mostly


@@ -479,11 +487,11 @@ public:
         // push/pop event handler: allows to chain a custom event handler to
         // alreasy existing ones
     void PushEventHandler( wxEvtHandler *handler );
         // push/pop event handler: allows to chain a custom event handler to
         // alreasy existing ones
     void PushEventHandler( wxEvtHandler *handler );

-    wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
+    wxEvtHandler *PopEventHandler( bool deleteHandler = false );

 
         // find the given handler in the event handler chain and remove (but
 
         // find the given handler in the event handler chain and remove (but

-        // not delete) it from the event handler chain, return TRUE if it was
-        // found and FALSE otherwise (this also results in an assert failure so
+        // not delete) it from the event handler chain, return true if it was
+        // found and false otherwise (this also results in an assert failure so

         // this function should only be called when the handler is supposed to
         // be there)
     bool RemoveEventHandler(wxEvtHandler *handler);
         // this function should only be called when the handler is supposed to
         // be there)
     bool RemoveEventHandler(wxEvtHandler *handler);


@@ -502,7 +510,7 @@ public:
     // dialog oriented functions
     // -------------------------
 
     // dialog oriented functions
     // -------------------------
 

-        // validate the correctness of input, return TRUE if ok
+        // validate the correctness of input, return true if ok

     virtual bool Validate();
 
         // transfer data between internal and GUI representations
     virtual bool Validate();
 
         // transfer data between internal and GUI representations


@@ -574,11 +582,11 @@ public:
 
         // mark the specified rectangle (or the whole window) as "dirty" so it
         // will be repainted
 
         // mark the specified rectangle (or the whole window) as "dirty" so it
         // will be repainted

-    virtual void Refresh( bool eraseBackground = TRUE,
+    virtual void Refresh( bool eraseBackground = true,

                           const wxRect *rect = (const wxRect *) NULL ) = 0;
 
         // a less awkward wrapper for Refresh
                           const wxRect *rect = (const wxRect *) NULL ) = 0;
 
         // a less awkward wrapper for Refresh

-    void RefreshRect(const wxRect& rect) { Refresh(TRUE, &rect); }
+    void RefreshRect(const wxRect& rect) { Refresh(true, &rect); }

 
         // repaint all invalid areas of the window immediately
     virtual void Update() { }
 
         // repaint all invalid areas of the window immediately
     virtual void Update() { }


@@ -617,20 +625,20 @@ public:
     // --------------------------
 
         // set/retrieve the window colours (system defaults are used by
     // --------------------------
 
         // set/retrieve the window colours (system defaults are used by

-        // default): Set functions return TRUE if colour was changed
+        // default): Set functions return true if colour was changed

     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual bool SetForegroundColour( const wxColour &colour );
 
     wxColour GetBackgroundColour() const { return m_backgroundColour; }
     wxColour GetForegroundColour() const { return m_foregroundColour; }
 
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual bool SetForegroundColour( const wxColour &colour );
 
     wxColour GetBackgroundColour() const { return m_backgroundColour; }
     wxColour GetForegroundColour() const { return m_foregroundColour; }
 

-        // set/retrieve the cursor for this window (SetCursor() returns TRUE
+        // set/retrieve the cursor for this window (SetCursor() returns true

         // if the cursor was really changed)
     virtual bool SetCursor( const wxCursor &cursor );
     const wxCursor& GetCursor() const { return m_cursor; }
     wxCursor& GetCursor() { return m_cursor; }
 
         // if the cursor was really changed)
     virtual bool SetCursor( const wxCursor &cursor );
     const wxCursor& GetCursor() const { return m_cursor; }
     wxCursor& GetCursor() { return m_cursor; }
 

-        // set/retrieve the font for the window (SetFont() returns TRUE if the
+        // set/retrieve the font for the window (SetFont() returns true if the

         // font really changed)
     virtual bool SetFont( const wxFont &font ) = 0;
     const wxFont& GetFont() const { return m_font; }
         // font really changed)
     virtual bool SetFont( const wxFont &font ) = 0;
     const wxFont& GetFont() const { return m_font; }


@@ -700,7 +708,7 @@ public:
     // get border for the flags of this window
     wxBorder GetBorder() const { return GetBorder(GetWindowStyleFlag()); }
 
     // get border for the flags of this window
     wxBorder GetBorder() const { return GetBorder(GetWindowStyleFlag()); }
 

-    // send wxUpdateUIEvents to this window, and children if recurse is TRUE
+    // send wxUpdateUIEvents to this window, and children if recurse is true

     virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
 
     // do the window-specific processing after processing the update event
     virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
 
     // do the window-specific processing after processing the update event


@@ -728,8 +736,8 @@ public:
                                int pos,
                                int thumbvisible,
                                int range,
                                int pos,
                                int thumbvisible,
                                int range,

-                               bool refresh = TRUE ) = 0;
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ) = 0;
+                               bool refresh = true ) = 0;
+    virtual void SetScrollPos( int orient, int pos, bool refresh = true ) = 0;

     virtual int GetScrollPos( int orient ) const = 0;
     virtual int GetScrollThumb( int orient ) const = 0;
     virtual int GetScrollRange( int orient ) const = 0;
     virtual int GetScrollPos( int orient ) const = 0;
     virtual int GetScrollThumb( int orient ) const = 0;
     virtual int GetScrollRange( int orient ) const = 0;


@@ -740,9 +748,9 @@ public:
 
         // scrolls window by line/page: note that not all controls support this
         //
 
         // scrolls window by line/page: note that not all controls support this
         //

-        // return TRUE if the position changed, FALSE otherwise
-    virtual bool ScrollLines(int WXUNUSED(lines)) { return FALSE; }
-    virtual bool ScrollPages(int WXUNUSED(pages)) { return FALSE; }
+        // return true if the position changed, false otherwise
+    virtual bool ScrollLines(int WXUNUSED(lines)) { return false; }
+    virtual bool ScrollPages(int WXUNUSED(pages)) { return false; }

 
         // convenient wrappers for ScrollLines/Pages
     bool LineUp() { return ScrollLines(-1); }
 
         // convenient wrappers for ScrollLines/Pages
     bool LineUp() { return ScrollLines(-1); }


@@ -775,6 +783,7 @@ public:
     void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); }
         // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const { return m_tooltip; }
     void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); }
         // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const { return m_tooltip; }

+    wxString GetToolTipText() const ;

 #endif // wxUSE_TOOLTIPS
 
     // drag and drop
 #endif // wxUSE_TOOLTIPS
 
     // drag and drop


@@ -803,7 +812,7 @@ public:
     void ResetConstraints();
 
         // these methods may be overriden for special layout algorithms
     void ResetConstraints();
 
         // these methods may be overriden for special layout algorithms

-    virtual void SetConstraintSizes(bool recurse = TRUE);
+    virtual void SetConstraintSizes(bool recurse = true);

     virtual bool LayoutPhase1(int *noChanges);
     virtual bool LayoutPhase2(int *noChanges);
     virtual bool DoPhase(int phase);
     virtual bool LayoutPhase1(int *noChanges);
     virtual bool LayoutPhase2(int *noChanges);
     virtual bool DoPhase(int phase);


@@ -827,8 +836,8 @@ public:
     virtual bool Layout();
 
         // sizers
     virtual bool Layout();
 
         // sizers

-    void SetSizer(wxSizer *sizer, bool deleteOld = TRUE );
-    void SetSizerAndFit( wxSizer *sizer, bool deleteOld = TRUE );
+    void SetSizer(wxSizer *sizer, bool deleteOld = true );
+    void SetSizerAndFit( wxSizer *sizer, bool deleteOld = true );

 
     wxSizer *GetSizer() const { return m_windowSizer; }
 
 
     wxSizer *GetSizer() const { return m_windowSizer; }
 


@@ -1139,10 +1148,6 @@ private:
         #define wxWindowNative wxWindowMSW
     #else // !wxUniv
         #define wxWindowMSW wxWindow
         #define wxWindowNative wxWindowMSW
     #else // !wxUniv
         #define wxWindowMSW wxWindow

-        #define sm_classwxWindowMSW sm_classwxWindow
-        #define sm_constructorPropertiesCountwxWindowMSW sm_constructorPropertiesCountwxWindow
-        #define sm_constructorPropertieswxWindowMSW sm_constructorPropertieswxWindow
-        #define sm_constructorwxWindowMSW sm_constructorwxWindow

     #endif // wxUniv/!wxUniv
     #include "wx/msw/window.h"
 #elif defined(__WXMOTIF__)
     #endif // wxUniv/!wxUniv
     #include "wx/msw/window.h"
 #elif defined(__WXMOTIF__)


@@ -1152,7 +1157,6 @@ private:
         #define wxWindowNative wxWindowGTK
     #else // !wxUniv
         #define wxWindowGTK wxWindow
         #define wxWindowNative wxWindowGTK
     #else // !wxUniv
         #define wxWindowGTK wxWindow

-        #define sm_classwxWindowGTK sm_classwxWindow

     #endif // wxUniv
     #include "wx/gtk/window.h"
 #elif defined(__WXX11__)
     #endif // wxUniv
     #include "wx/gtk/window.h"
 #elif defined(__WXX11__)


@@ -1160,7 +1164,6 @@ private:
         #define wxWindowNative wxWindowX11
     #else // !wxUniv
         #define wxWindowX11 wxWindow
         #define wxWindowNative wxWindowX11
     #else // !wxUniv
         #define wxWindowX11 wxWindow

-        #define sm_classwxWindowX11 sm_classwxWindow

     #endif // wxUniv
     #include "wx/x11/window.h"
 #elif defined(__WXMGL__)
     #endif // wxUniv
     #include "wx/x11/window.h"
 #elif defined(__WXMGL__)


@@ -1168,7 +1171,6 @@ private:
         #define wxWindowNative wxWindowMGL
     #else // !wxUniv
         #define wxWindowMGL wxWindow
         #define wxWindowNative wxWindowMGL
     #else // !wxUniv
         #define wxWindowMGL wxWindow

-        #define sm_classwxWindowMGL sm_classwxWindow

     #endif // wxUniv
     #include "wx/mgl/window.h"
 #elif defined(__WXMAC__)
     #endif // wxUniv
     #include "wx/mgl/window.h"
 #elif defined(__WXMAC__)


@@ -1176,7 +1178,6 @@ private:
         #define wxWindowNative wxWindowMac
     #else // !wxUniv
         #define wxWindowMac wxWindow
         #define wxWindowNative wxWindowMac
     #else // !wxUniv
         #define wxWindowMac wxWindow

-        #define sm_classwxWindowMac sm_classwxWindow

     #endif // wxUniv
     #include "wx/mac/window.h"
 #elif defined(__WXCOCOA__)
     #endif // wxUniv
     #include "wx/mac/window.h"
 #elif defined(__WXCOCOA__)


@@ -1184,7 +1185,6 @@ private:
         #define wxWindowNative wxWindowCocoa
     #else // !wxUniv
         #define wxWindowCocoa wxWindow
         #define wxWindowNative wxWindowCocoa
     #else // !wxUniv
         #define wxWindowCocoa wxWindow

-        #define sm_classwxWindowCocoa sm_classwxWindow

     #endif // wxUniv
     #include "wx/cocoa/window.h"
 #elif defined(__WXPM__)
     #endif // wxUniv
     #include "wx/cocoa/window.h"
 #elif defined(__WXPM__)


@@ -1192,7 +1192,6 @@ private:
         #define wxWindowNative wxWindowOS2
     #else // !wxUniv
         #define wxWindowOS2 wxWindow
         #define wxWindowNative wxWindowOS2
     #else // !wxUniv
         #define wxWindowOS2 wxWindow

-        #define sm_classwxWindowOS2 sm_classwxWindow

     #endif // wxUniv/!wxUniv
     #include "wx/os2/window.h"
 #endif
     #endif // wxUniv/!wxUniv
     #include "wx/os2/window.h"
 #endif


@@ -1322,7 +1321,7 @@ public:
         // Gets a variant representing the selected children
         // of this object.
         // Acceptable values:
         // Gets a variant representing the selected children
         // of this object.
         // Acceptable values:

-        // - a null variant (IsNull() returns TRUE)
+        // - a null variant (IsNull() returns true)

         // - a list variant (GetType() == wxT("list")
         // - an integer representing the selected child element,
         //   or 0 if this object is selected (GetType() == wxT("long")
         // - a list variant (GetType() == wxT("list")
         // - an integer representing the selected child element,
         //   or 0 if this object is selected (GetType() == wxT("long")