show the taskbar icon even after Explorer restart (patch 723532) + some code cleanup

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 4ad4f8e2f5115f1064b38bddee4e7953958d706f..4f13277f1ea16556ee8f1fa85a2ef00f0fff2a24 100644 (file)
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -20,7 +20,7 @@
 // wxFrame
 // ----------------------------------------------------------------------------
 
 // wxFrame
 // ----------------------------------------------------------------------------
 

-class wxFrame : public wxFrameBase
+class WXDLLEXPORT wxFrame : public wxFrameBase

 {
 public:
     wxFrame() {}
 {
 public:
     wxFrame() {}


@@ -34,7 +34,7 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
     {
         Create(parent, id, title, pos, size, style, name);
     }

-            
+

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


@@ -53,13 +53,23 @@ public:
                                          const wxString& name = wxStatusLineNameStr);
 #endif // wxUSE_STATUSBAR
 
                                          const wxString& name = wxStatusLineNameStr);
 #endif // wxUSE_STATUSBAR
 

+#if wxUSE_TOOLBAR
+    // create main toolbar bycalling OnCreateToolBar()
+    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
+                                     wxWindowID id = -1,
+                                     const wxString& name = wxToolBarNameStr);
+    virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
+    virtual int GetMinWidth() const;
+    virtual int GetMinHeight() const;
+
+    // sends wxSizeEvent to itself (used after attaching xxxBar)
+    virtual void SendSizeEvent();

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

-    
-    // sends wxSizeEvent to itself (used after attaching xxxBar)
-    void SendSizeEvent();
-    
+

     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
 
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);