added wxSetCCUnicodeFormat() and use it in wxTreeCtrl/wxToolBar; also replaced SendMe...

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index dec7df28260e35a1f678161126279290d885e0e4..1d5e440809d15f07f44a3fca5edeef6ad2dc13f7 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 

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

     #pragma interface "mdi.h"
 #endif
 
     #pragma interface "mdi.h"
 #endif
 


@@ -90,9 +90,9 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     // override window proc for MDI-specific message processing
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     // override window proc for MDI-specific message processing

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

 
 

-    virtual long MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM);
+    virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM);

     virtual bool MSWTranslateMessage(WXMSG* msg);
 
 protected:
     virtual bool MSWTranslateMessage(WXMSG* msg);
 
 protected:


@@ -164,8 +164,8 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleGetMinMaxInfo(void *mmInfo);
 
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleGetMinMaxInfo(void *mmInfo);
 

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

     virtual bool MSWTranslateMessage(WXMSG *msg);
 
     virtual void MSWDestroyWindow();
     virtual bool MSWTranslateMessage(WXMSG *msg);
 
     virtual void MSWDestroyWindow();


@@ -189,7 +189,7 @@ private:
     bool m_needsResize; // flag which tells us to artificially resize the frame
 
     DECLARE_EVENT_TABLE()
     bool m_needsResize; // flag which tells us to artificially resize the frame
 
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -224,7 +224,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow)

 };
 
 #endif
 };
 
 #endif