Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 152787a7210b34dea73ffa5b46948213b47ce861..d13c7657a65c17ed0b18362afb20f103dcbe346c 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -8,7 +8,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_WINDOW_H_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_WINDOW_H_


@@ -73,6 +73,8 @@ public:
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 

+    virtual ~wxWindow();
+

     // background pixmap support
     // -------------------------
 
     // background pixmap support
     // -------------------------
 


@@ -91,8 +93,8 @@ public:
                               int pos,
                               int page,
                               int range,
                               int pos,
                               int page,
                               int range,

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

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


@@ -126,8 +128,8 @@ public:
     // return all state flags at once (combination of wxCONTROL_XXX values)
     int GetStateFlags() const;
 
     // return all state flags at once (combination of wxCONTROL_XXX values)
     int GetStateFlags() const;
 

-    // set the "highlighted" flag and return TRUE if it changed
-    virtual bool SetCurrent(bool doit = TRUE);
+    // set the "highlighted" flag and return true if it changed
+    virtual bool SetCurrent(bool doit = true);

 
     // get the scrollbar (may be NULL) for the given orientation
     wxScrollBar *GetScrollbar(int orient) const
 
     // get the scrollbar (may be NULL) for the given orientation
     wxScrollBar *GetScrollbar(int orient) const


@@ -138,33 +140,22 @@ public:
     // methods used by wxColourScheme to choose the colours for this window
     // --------------------------------------------------------------------
 
     // methods used by wxColourScheme to choose the colours for this window
     // --------------------------------------------------------------------
 

-    // return TRUE if this is a panel/canvas window which contains other
+    // return true if this is a panel/canvas window which contains other

     // controls only
     // controls only

-    virtual bool IsCanvasWindow() const { return FALSE; }
-
-    // returns TRUE if the control has "transparent" areas such
-    // as a wxStaticText and wxCheckBox and the background should
-    // be adapted from a parent window
-    virtual bool HasTransparentBackground() { return FALSE; }
-    
-    // to be used with function above: transparent windows get
-    // their background from parents that return TRUE here,
-    // so this is mostly for wxPanel, wxTopLevelWindow etc.
-    virtual bool ProvidesBackground() const { return FALSE; }
-
-    // return TRUE if this control can be highlighted when the mouse is over
+    virtual bool IsCanvasWindow() const { return false; }
+
+    // return true if this control can be highlighted when the mouse is over

     // it (the theme decides itself whether it is really highlighted or not)
     // it (the theme decides itself whether it is really highlighted or not)

-    virtual bool CanBeHighlighted() const { return FALSE; }
+    virtual bool CanBeHighlighted() const { return false; }

 
 

-    // return TRUE if we should use the colours/fonts returned by the
+    // return true if we should use the colours/fonts returned by the

     // corresponding GetXXX() methods instead of the default ones
     // corresponding GetXXX() methods instead of the default ones

-    bool UseBgCol() const { return m_hasBgCol; }

     bool UseFgCol() const { return m_hasFgCol; }
     bool UseFont() const { return m_hasFont; }
 
     bool UseFgCol() const { return m_hasFgCol; }
     bool UseFont() const { return m_hasFont; }
 

-    // return TRUE if this window serves as a container for the other windows
+    // return true if this window serves as a container for the other windows

     // only and doesn't get any input itself
     // only and doesn't get any input itself

-    virtual bool IsStaticBox() const { return FALSE; }
+    virtual bool IsStaticBox() const { return false; }

 
     // returns the (low level) renderer to use for drawing the control by
     // querying the current theme
 
     // returns the (low level) renderer to use for drawing the control by
     // querying the current theme


@@ -181,17 +172,17 @@ public:
 
     // erase part of the control
     virtual void EraseBackground(wxDC& dc, const wxRect& rect);
 
     // erase part of the control
     virtual void EraseBackground(wxDC& dc, const wxRect& rect);

-    
+

     // overridden base class methods
     // -----------------------------
 
     // the rect coordinates are, for us, in client coords, but if no rect is
     // specified, the entire window is refreshed
     // overridden base class methods
     // -----------------------------
 
     // the rect coordinates are, for us, in client coords, but if no rect is
     // specified, the entire window is refreshed

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

                          const wxRect *rect = (const wxRect *) NULL);
 
     // we refresh the window when it is dis/enabled
                          const wxRect *rect = (const wxRect *) NULL);
 
     // we refresh the window when it is dis/enabled

-    virtual bool Enable(bool enable = TRUE);
+    virtual bool Enable(bool enable = true);

 
     // should we use the standard control colours or not?
     virtual bool ShouldInheritColours() const { return false; }
 
     // should we use the standard control colours or not?
     virtual bool ShouldInheritColours() const { return false; }


@@ -222,7 +213,7 @@ protected:
     void OnKeyUp(wxKeyEvent& event);
 #endif // wxUSE_MENUS
 
     void OnKeyUp(wxKeyEvent& event);
 #endif // wxUSE_MENUS
 

-    // draw the control background, return TRUE if done
+    // draw the control background, return true if done

     virtual bool DoDrawBackground(wxDC& dc);
 
     // draw the controls border
     virtual bool DoDrawBackground(wxDC& dc);
 
     // draw the controls border


@@ -250,12 +241,12 @@ protected:
 
     // the renderer we use
     wxRenderer *m_renderer;
 
     // the renderer we use
     wxRenderer *m_renderer;

-    
+

     // background bitmap info
     wxBitmap  m_bitmapBg;
     int       m_alignBgBitmap;
     wxStretch m_stretchBgBitmap;
     // background bitmap info
     wxBitmap  m_bitmapBg;
     int       m_alignBgBitmap;
     wxStretch m_stretchBgBitmap;

-    
+

     // old size
     wxSize m_oldSize;
 
     // old size
     wxSize m_oldSize;