Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index d3a845d84ad680d96788507aa330dd5b416cd8b1..d13c7657a65c17ed0b18362afb20f103dcbe346c 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -8,13 +8,13 @@
 // 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:     wxWindows license
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univwindow.h"
 #endif
 
     #pragma interface "univwindow.h"
 #endif
 


@@ -27,30 +27,6 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxRenderer;
 class WXDLLEXPORT wxScrollBar;
 
 class WXDLLEXPORT wxRenderer;
 class WXDLLEXPORT wxScrollBar;
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// control state flags used in wxRenderer and wxColourScheme
-enum
-{
-    wxCONTROL_DISABLED   = 0x00000001,  // control is disabled
-    wxCONTROL_FOCUSED    = 0x00000002,  // currently has keyboard focus
-    wxCONTROL_PRESSED    = 0x00000004,  // (button) is pressed
-    wxCONTROL_ISDEFAULT  = 0x00000008,  // only applies to the buttons
-    wxCONTROL_ISSUBMENU  = wxCONTROL_ISDEFAULT, // only for menu items
-    wxCONTROL_CURRENT    = 0x00000010,  // mouse is currently over the control
-    wxCONTROL_SELECTED   = 0x00000020,  // selected item in e.g. listbox
-    wxCONTROL_CHECKED    = 0x00000040,  // (check/radio button) is checked
-    wxCONTROL_CHECKABLE  = 0x00000080,  // (menu) item can be checked
-
-    wxCONTROL_FLAGS_MASK = 0x000000ff,
-
-    // this is a pseudo flag not used directly by wxRenderer but rather by some
-    // controls internally
-    wxCONTROL_DIRTY      = 0x80000000
-};
-

 #ifdef __WXX11__
 #define wxUSE_TWO_WINDOWS 1
 #else
 #ifdef __WXX11__
 #define wxUSE_TWO_WINDOWS 1
 #else


@@ -97,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
     // -------------------------
 


@@ -115,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;


@@ -150,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


@@ -162,28 +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; }
-
-    // return TRUE if this a container window which contains the other items:
-    // e.g, a listbox, listctrl, treectrl, ... and FALSE if it is a monolithic
-    // control (e.g. a button, checkbox, ...)
-    virtual bool IsContainerWindow() const { return FALSE; }
+    virtual bool IsCanvasWindow() const { return false; }

 
 

-    // return TRUE if this control can be highlighted when the mouse is over
+    // 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


@@ -200,20 +172,20 @@ 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);

-    
-    // see below
-    bool HasDialogBackground() { return m_hasDialogBackground; }

 
     // 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; }

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -228,7 +200,7 @@ protected:
 
     // event handlers
     void OnSize(wxSizeEvent& event);
 
     // event handlers
     void OnSize(wxSizeEvent& event);

-    void OnNcPaint(wxPaintEvent& event);
+    void OnNcPaint(wxNcPaintEvent& event);

     void OnPaint(wxPaintEvent& event);
     void OnErase(wxEraseEvent& event);
 
     void OnPaint(wxPaintEvent& event);
     void OnErase(wxEraseEvent& event);
 


@@ -241,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


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

-    
-    // background like a dialog (e.g. wxStaticText,
-    // wxRadioButton), not with a surface (wxButton)
-    bool m_hasDialogBackground;

 
     // 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;
 


@@ -287,7 +255,7 @@ protected:
 
 #ifdef __WXMSW__
     // override MSWWindowProc() to process WM_NCHITTEST
 
 #ifdef __WXMSW__
     // override MSWWindowProc() to process WM_NCHITTEST

-    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

 #endif // __WXMSW__
 
 private:
 #endif // __WXMSW__
 
 private: