blind fix for GCC compilation when #pragmas are honored

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index f1f12f0b44f13646c13c152a5ab2c182fa1e6b11..a4ce110bc61517b06b9fc6b1095a81a203336965 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -32,12 +32,14 @@
 // constants
 // ---------------------------------------------------------------------------
 
-// FIXME does anybody use those? they're unused by wxWidgets...
+#if WXWIN_COMPATIBILITY_2_4
+// they're unused by wxWidgets...
 enum
 {
     wxKEY_SHIFT = 1,
     wxKEY_CTRL  = 2
 };
+#endif
 
 // ---------------------------------------------------------------------------
 // wxWindow declaration for MSW
@@ -148,23 +150,27 @@ public:
     virtual bool UnregisterHotKey(int hotkeyId);
 #endif // wxUSE_HOTKEY
 
-    // implementation from now on
-    // --------------------------
-
-    // simple accessors
-    // ----------------
+    // window handle stuff
+    // -------------------
 
     WXHWND GetHWND() const { return m_hWnd; }
     void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
     virtual WXWidget GetHandle() const { return GetHWND(); }
 
+    void AssociateHandle(WXWidget handle);
+    void DissociateHandle();
+
+
+    // implementation from now on
+    // ==========================
+
     // event handlers
     // --------------
 
-    void OnEraseBackground(wxEraseEvent& event);
     void OnPaint(wxPaintEvent& event);
+    void OnEraseBackground(wxEraseEvent& event);
 #ifdef __WXWINCE__
-    void OnInitDialog( wxInitDialogEvent& event );
+    void OnInitDialog(wxInitDialogEvent& event);
 #endif
 
 public:
@@ -253,7 +259,7 @@ public:
     void UnpackScroll(WXWPARAM wParam, WXLPARAM lParam,
                       WXWORD *code, WXWORD *pos, WXHWND *hwnd);
     void UnpackCtlColor(WXWPARAM wParam, WXLPARAM lParam,
-                        WXWORD *nCtlColor, WXHDC *hdc, WXHWND *hwnd);
+                        WXHDC *hdc, WXHWND *hwnd);
     void UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam,
                           WXWORD *item, WXWORD *flags, WXHMENU *hmenu);
 
@@ -301,13 +307,7 @@ public:
 
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
-    bool HandleCtlColor(WXHBRUSH *hBrush,
-                        WXHDC hdc,
-                        WXHWND hWnd,
-                        WXUINT nCtlColor,
-                        WXUINT message,
-                        WXWPARAM wParam,
-                        WXLPARAM lParam);
+    bool HandleCtlColor(WXHBRUSH *hBrush, WXHDC hdc, WXHWND hWnd);
 
     bool HandlePaletteChanged(WXHWND hWndPalChange);
     bool HandleQueryNewPalette();
@@ -364,12 +364,43 @@ public:
 
     // this function should return the brush to paint the window background
     // with or 0 for the default brush
-    virtual WXHBRUSH OnCtlColor(WXHDC hDC,
-                                WXHWND hWnd,
-                                WXUINT nCtlColor,
-                                WXUINT message,
-                                WXWPARAM wParam,
-                                WXLPARAM lParam);
+    virtual WXHBRUSH MSWControlColor(WXHDC hDC);
+
+    // this function should return the brush to paint the children controls
+    // background or 0 if this window doesn't impose any particular background
+    // on its children
+    //
+    // the base class version uses MSWGetBgColourForChild() and returns a solid
+    // brush if we have a non default background colour or 0 otherwise
+    virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC WXUNUSED(hDC), wxWindow *child)
+    {
+        return MSWGetSolidBgBrushForChild(child);
+    }
+
+    // return the background colour of this window under the given child
+    // (possible grand child)
+    //
+    // this is a hack as if the background is themed, there is no single colour
+    // representing it, but sometimes we can't use the pattern brush returned
+    // by MSWGetBgBrushForChild() anyhow and then this function is used as
+    // fallback
+    //
+    // the base class version returns bg colour if it had been explicitely set
+    // or wxNullColour otherwise
+    virtual wxColour MSWGetBgColourForChild(wxWindow *child);
+
+    // convenience function: returns a solid brush of the colour returned by
+    // MSWGetBgColourForChild() or 0
+    WXHBRUSH MSWGetSolidBgBrushForChild(wxWindow *child);
+
+    // normally just calls MSWGetBgBrushForChild() on the parent window but may
+    // be overridden if the default background brush is not suitable for some
+    // reason (e.g. wxStaticBox uses MSWGetSolidBgBrushForChild() instead)
+    virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC);
+
+    // return the background brush to use for this window by quering the parent
+    // windows via their MSWGetBgBrushForChild() recursively
+    WXHBRUSH MSWGetBgBrush(WXHDC hDC);
 
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -406,8 +437,6 @@ protected:
     int                   m_lastMouseEvent;
 #endif // wxUSE_MOUSEEVENT_HACK
 
-    WXHMENU               m_hMenu; // Menu, if any
-
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
@@ -487,7 +516,7 @@ inline void wxWindowMSW::SetTransparent(bool WXUNUSED(t)) { }
 
 // kbd code translation
 WXDLLEXPORT int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0);
-WXDLLEXPORT int wxCharCodeWXToMSW(int id, bool *IsVirtual);
+WXDLLEXPORT WXWORD wxCharCodeWXToMSW(int id, bool *IsVirtual);
 
 // window creation helper class: before creating a new HWND, instantiate an
 // object of this class on stack - this allows to process the messages sent to