added wxTLS_TYPE() macro

[wxWidgets.git] / include / wx / generic / mdig.h

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 8ca22f234390aa7166889ace96a726bff5483339..bee3506d099170da2b68be92a99f5a8fa73380a0 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MDIG_H_
 #define _WX_MDIG_H_
 
 #ifndef _WX_MDIG_H_
 #define _WX_MDIG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "mdig.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -24,23 +20,25 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 
 #include "wx/panel.h"
 #include "wx/notebook.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxIconBundle;
+
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];

 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericMDIParentFrame;
-class WXDLLEXPORT wxGenericMDIClientWindow;
-class WXDLLEXPORT wxGenericMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxGenericMDIParentFrame;
+class WXDLLIMPEXP_FWD_CORE wxGenericMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame;

 
 //-----------------------------------------------------------------------------
 // wxGenericMDIParentFrame
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxGenericMDIParentFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxGenericMDIParentFrame: public wxFrame

 {
 public:
     wxGenericMDIParentFrame();
 {
 public:
     wxGenericMDIParentFrame();


@@ -52,7 +50,7 @@ public:
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxFrameNameStr);
 
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxFrameNameStr);
 

-    ~wxGenericMDIParentFrame();
+    virtual ~wxGenericMDIParentFrame();

     bool Create( wxWindow *parent,
                  wxWindowID winid,
                  const wxString& title,
     bool Create( wxWindow *parent,
                  wxWindowID winid,
                  const wxString& title,


@@ -79,7 +77,7 @@ public:
     virtual wxGenericMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() { /* Has no effect */ }
     virtual wxGenericMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() { /* Has no effect */ }

-    virtual void Tile() { /* Has no effect */ }
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { }

     virtual void ArrangeIcons() { /* Has no effect */ }
     virtual void ActivateNext();
     virtual void ActivatePrevious();
     virtual void ArrangeIcons() { /* Has no effect */ }
     virtual void ActivateNext();
     virtual void ActivatePrevious();


@@ -113,7 +111,7 @@ private:
 // wxGenericMDIChildFrame
 //-----------------------------------------------------------------------------
 
 // wxGenericMDIChildFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel
+class WXDLLIMPEXP_CORE wxGenericMDIChildFrame: public wxPanel

 {
 public:
     wxGenericMDIChildFrame();
 {
 public:
     wxGenericMDIChildFrame();


@@ -157,14 +155,6 @@ public:
     virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
 #endif
 
     virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
 #endif
 

-    // no size hints
-    virtual void SetSizeHints( int WXUNUSED(minW),
-                               int WXUNUSED(minH),
-                               int WXUNUSED(maxW) = wxDefaultSize.x,
-                               int WXUNUSED(maxH) = wxDefaultSize.y,
-                               int WXUNUSED(incW) = wxDefaultSize.x,
-                               int WXUNUSED(incH) = wxDefaultSize.y) {}
-

 #if wxUSE_TOOLBAR
     // no toolbar bars
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
 #if wxUSE_TOOLBAR
     // no toolbar bars
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),


@@ -175,8 +165,8 @@ public:
 #endif
 
     // no icon
 #endif
 
     // no icon

-    void SetIcon( const wxIcon& WXUNUSED(icon) ) { }
-    void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
+    void SetIcon(const wxIcon& WXUNUSED(icon)) { }
+    virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }

 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ }
 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ }


@@ -213,6 +203,11 @@ protected:
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

+    // no size hints
+    virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
+                                int WXUNUSED(maxW), int WXUNUSED(maxH),
+                                int WXUNUSED(incW), int WXUNUSED(incH)) {}
+

     // This function needs to be called when a size change is confirmed,
     // we needed this function to prevent any body from the outside
     // changing the panel... it messes the UI layout when we would allow it.
     // This function needs to be called when a size change is confirmed,
     // we needed this function to prevent any body from the outside
     // changing the panel... it messes the UI layout when we would allow it.


@@ -229,12 +224,12 @@ private:
 // wxGenericMDIClientWindow
 //-----------------------------------------------------------------------------
 
 // wxGenericMDIClientWindow
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
+class WXDLLIMPEXP_CORE wxGenericMDIClientWindow: public wxNotebook

 {
 public:
     wxGenericMDIClientWindow();
     wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
 {
 public:
     wxGenericMDIClientWindow();
     wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );

-    ~wxGenericMDIClientWindow();
+    virtual ~wxGenericMDIClientWindow();

     virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
     virtual int SetSelection(size_t nPage);
     virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
     virtual int SetSelection(size_t nPage);


@@ -242,7 +237,7 @@ public:
 protected:
     void PageChanged(int OldSelection, int newSelection);
 
 protected:
     void PageChanged(int OldSelection, int newSelection);
 

-    void OnPageChanged(wxNotebookEvent& event);
+    void OnPageChanged(wxBookCtrlEvent& event);

     void OnSize(wxSizeEvent& event);
 
 private:
     void OnSize(wxSizeEvent& event);
 
 private:


@@ -271,7 +266,7 @@ class wxMDIChildFrame ;
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxGenericMDIParentFrame

 {
 public:
     wxMDIParentFrame() {}
 {
 public:
     wxMDIParentFrame() {}


@@ -297,7 +292,7 @@ private:
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxGenericMDIChildFrame

 {
 public:
     wxMDIChildFrame() {}
 {
 public:
     wxMDIChildFrame() {}


@@ -320,7 +315,7 @@ private:
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxGenericMDIClientWindow

 {
 public:
     wxMDIClientWindow() {}
 {
 public:
     wxMDIClientWindow() {}