wxTreeEvent is declared in one header, not 3 of them

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 36458bf83a49dc41367727408fcebe0017bc6491..7dfaf63fc638d88ab9b7f79591d45f08f041b5d7 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -73,15 +73,19 @@ public:
     virtual wxMenuBar *GetMenuBar() const;
 
     // Call this to simulate a menu command
     virtual wxMenuBar *GetMenuBar() const;
 
     // Call this to simulate a menu command

-    bool Command(int id) { ProcessCommand(id); }
+    bool Command(int id) { return ProcessCommand(id); }

 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);
 
 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);
 

+    // make the window modal (all other windows unresponsive)
+    virtual void MakeModal(bool modal = TRUE);
+

     // Set icon
     virtual void SetIcon(const wxIcon& icon);
 
     // Toolbar
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
 
     // Toolbar

+#if wxUSE_TOOLBAR

     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
     virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);


@@ -92,7 +96,9 @@ public:
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
 
     virtual void PositionToolBar();
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
 
     virtual void PositionToolBar();

+#endif // wxUSE_TOOLBAR

 
 

+#if wxUSE_STATUSBAR

     // Status bar
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
     // Status bar
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,


@@ -118,6 +124,7 @@ public:
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
     static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
     static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };

+#endif // wxUSE_STATUSBAR

 
     // Iconize
     virtual void Iconize(bool iconize);
 
     // Iconize
     virtual void Iconize(bool iconize);


@@ -153,8 +160,8 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
 

-    bool MSWCreate(int id, wxWindow *parent, const char *wclass,
-                   wxWindow *wx_win, const char *title,
+    bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass,
+                   wxWindow *wx_win, const wxChar *title,

                    int x, int y, int width, int height, long style);
 
   // tooltip management
                    int x, int y, int width, int height, long style);
 
   // tooltip management


@@ -188,13 +195,19 @@ protected:
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     wxMenuBar *           m_frameMenuBar;
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     wxMenuBar *           m_frameMenuBar;

-    wxStatusBar *         m_frameStatusBar;

     wxIcon                m_icon;
     bool                  m_iconized;
     WXHICON               m_defaultIcon;
     wxIcon                m_icon;
     bool                  m_iconized;
     WXHICON               m_defaultIcon;

-    wxToolBar *           m_frameToolBar;
+
+#if wxUSE_STATUSBAR
+    wxStatusBar *         m_frameStatusBar;

 
     static bool           m_useNativeStatusBar;
 
     static bool           m_useNativeStatusBar;

+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    wxToolBar *           m_frameToolBar;
+#endif // wxUSE_TOOLBAR

 
 private:
 #if wxUSE_TOOLTIPS
 
 private:
 #if wxUSE_TOOLTIPS