Fix for drag object bug

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 21b6badf8670933d842f55378a8202adf8d05bdd..b858afcd54765bb10daffb4ace426c5817218e24 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -102,6 +102,8 @@ public:
     // current size - this has an effect of refreshing the window layout
     virtual void SendSizeEvent();
 
     // current size - this has an effect of refreshing the window layout
     virtual void SendSizeEvent();
 

+    virtual wxPoint GetClientAreaOrigin() const;
+    

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -126,14 +128,14 @@ protected:
     bool MSWTranslateMessage(WXMSG* pMsg);
 
     // window proc for the frames
     bool MSWTranslateMessage(WXMSG* pMsg);
 
     // window proc for the frames

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

 
     // handle WM_INITMENUPOPUP message
     bool HandleInitMenuPopup(WXHMENU hMenu);
 
     virtual bool IsMDIChild() const { return FALSE; }
 
 
     // handle WM_INITMENUPOPUP message
     bool HandleInitMenuPopup(WXHMENU hMenu);
 
     virtual bool IsMDIChild() const { return FALSE; }
 

-    // get default (wxWindows) icon for the frame
+    // get default (wxWidgets) icon for the frame

     virtual WXHICON GetDefaultIcon() const;
 
 #if wxUSE_STATUSBAR
     virtual WXHICON GetDefaultIcon() const;
 
 #if wxUSE_STATUSBAR