use different strings for wchar_t and UTF-8-based Unicode builds

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

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index e27da81e02ed5cedfdefa6e81fc563978808f44f..8d8ab5f2ad9ebfbd7d5a7693581529a5311fc031 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -23,14 +23,14 @@ but wxMDIChildFrame::GetParent should return the parent frame.
 #include "wx/frame.h"
 #include "wx/notebook.h"
 
-class WXDLLEXPORT wxMDIClientWindow;
-class WXDLLEXPORT wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
-class WXDLLEXPORT wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 
-        friend class WXDLLEXPORT wxMDIChildFrame;
+        friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 public:
 
     wxMDIParentFrame();
@@ -112,7 +112,7 @@ protected:
     DECLARE_EVENT_TABLE()
 };
 
-class WXDLLEXPORT wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 
@@ -152,12 +152,6 @@ public:
     void ReleaseMouse();
     void Raise();
     void Lower(void);
-    void DoSetSizeHints(int minW = wxDefaultCoord,
-                        int minH = wxDefaultCoord,
-                        int maxW = wxDefaultCoord,
-                        int maxH = wxDefaultCoord,
-                        int incW = wxDefaultCoord,
-                        int incH = wxDefaultCoord);
 
     // MDI operations
     virtual void Maximize();
@@ -199,6 +193,9 @@ protected:
     void DoGetClientSize(int *width, int *height) const;
     void DoGetSize(int *width, int *height) const;
     void DoGetPosition(int *x, int *y) const ;
+    void DoSetSizeHints(int minW, int minH,
+                        int maxW, int maxH,
+                        int incW, int incH);
 };
 
 /* The client window is a child of the parent MDI frame, and itself
@@ -208,7 +205,7 @@ protected:
 * of the children. Phew! So the children are sort of 'adopted'...
 */
 
-class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxNotebook
 {
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)