Added wxPaintDCEx class, to handle the case where an HDC

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 4b27759ebfbd27436f6ed0d17b076963d731fe92..7222108b45b7da7236591da1320415ffa54be90e 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -128,8 +128,8 @@ protected:
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 

-    // handle WM_INITMENU message
-    bool HandleInitMenu();
+    // handle WM_INITMENUPOPUP message
+    bool HandleInitMenuPopup(WXHMENU hMenu);

 
     virtual bool IsMDIChild() const { return FALSE; }
 
 
     virtual bool IsMDIChild() const { return FALSE; }
 


@@ -149,15 +149,12 @@ private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips

-#ifdef __WXWINCE__
-    WXHWND                m_commandBar;
-#endif

 
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;
 
     DECLARE_EVENT_TABLE()
 
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame)

 };
 
 #endif
 };
 
 #endif