activating DrawRectangle optimization

[wxWidgets.git] / include / wx / gtk / filepicker.h

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index 2276335e9127cc53c70901e5f1f84320143c5849..68a59090e02d4ad9060f3b61bf29db07f082cf4d 100644 (file)
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -101,13 +101,12 @@ public:     // overrides
     void OnDialogOK(wxCommandEvent &);
 
     virtual void SetPath(const wxString &str);
     void OnDialogOK(wxCommandEvent &);
 
     virtual void SetPath(const wxString &str);

+    virtual void SetInitialDirectory(const wxString& dir);

 
     // see macro defined above
     FILEDIRBTN_OVERRIDES
 
 protected:
 
     // see macro defined above
     FILEDIRBTN_OVERRIDES
 
 protected:

-    virtual bool GTKShouldConnectSizeRequest() const { return false; }
-

     wxDialog *m_dialog;
 
 private:
     wxDialog *m_dialog;
 
 private:


@@ -171,18 +170,12 @@ public:     // overrides
     }
 
     virtual void SetPath(const wxString &str);
     }
 
     virtual void SetPath(const wxString &str);

+    virtual void SetInitialDirectory(const wxString& dir);

 
     // see macro defined above
     FILEDIRBTN_OVERRIDES
 
 protected:
 
     // see macro defined above
     FILEDIRBTN_OVERRIDES
 
 protected:

-    // common part of all ctors
-    void Init()
-    {
-        m_dialog = NULL;
-        m_bIgnoreNextChange = false;
-    }
-

     wxDialog *m_dialog;
 
 public:    // used by the GTK callback only
     wxDialog *m_dialog;
 
 public:    // used by the GTK callback only


@@ -192,6 +185,12 @@ public:    // used by the GTK callback only
     void GTKUpdatePath(const char *gtkpath);
 
 private:
     void GTKUpdatePath(const char *gtkpath);
 
 private:

+    void Init()
+    {
+        m_dialog = NULL;
+        m_bIgnoreNextChange = false;
+    }
+

     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };