Set minsize and implement DoGetBestSize

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 12bb66c3b5f8901876fb33bb2851b68452acb460..32b6b7bf34fd5e8cb42c01d0252a83466fa56a56 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -2730,6 +2730,7 @@ private:
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     

+    virtual wxSize DoGetBestSize() const;

 
     // Turn notifications from Scintilla into events
     void NotifyChange();
 
     // Turn notifications from Scintilla into events
     void NotifyChange();

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index f96e8ffadc0e605261ab7a2ce4813ecb30427a6d..8ab07a92ab201863553defe45bd764fa7ae9afe1 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -168,6 +168,8 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif

+
+    SetBestFittingSize(size);

 }
 
 
 }
 
 


@@ -2757,6 +2759,14 @@ void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) {
 }
 
 
 }
 
 

+wxSize wxStyledTextCtrl::DoGetBestSize() const
+{
+    // What would be the best size for a wxSTC?
+    // Just give a reasonable minimum until something else can be figured out.
+    return wxSize(200,100);
+}
+
+

 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 
 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index 11f590c9a47e392a6e2075454dee23bf7d730b82..6e626e3bef272310d862558d85eb17b73586f12b 100644 (file)
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -168,6 +168,8 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif

+
+    SetBestFittingSize(size);

 }
 
 
 }
 
 


@@ -566,6 +568,14 @@ void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) {
 }
 
 
 }
 
 

+wxSize wxStyledTextCtrl::DoGetBestSize() const
+{
+    // What would be the best size for a wxSTC?
+    // Just give a reasonable minimum until something else can be figured out.
+    return wxSize(200,100);
+}
+
+

 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 
 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 

diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in
index 2592301f637911e10843077b2392d1a3b1ac68ca..91148d3575abb9ea89f2a22bdae125315cceb2f0 100644 (file)
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -246,6 +246,7 @@ private:
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     

+    virtual wxSize DoGetBestSize() const;

 
     // Turn notifications from Scintilla into events
     void NotifyChange();
 
     // Turn notifications from Scintilla into events
     void NotifyChange();

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 12bb66c3b5f8901876fb33bb2851b68452acb460..32b6b7bf34fd5e8cb42c01d0252a83466fa56a56 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -2730,6 +2730,7 @@ private:
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     

+    virtual wxSize DoGetBestSize() const;

 
     // Turn notifications from Scintilla into events
     void NotifyChange();
 
     // Turn notifications from Scintilla into events
     void NotifyChange();

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index f96e8ffadc0e605261ab7a2ce4813ecb30427a6d..8ab07a92ab201863553defe45bd764fa7ae9afe1 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -168,6 +168,8 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif

+
+    SetBestFittingSize(size);

 }
 
 
 }
 
 


@@ -2757,6 +2759,14 @@ void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) {
 }
 
 
 }
 
 

+wxSize wxStyledTextCtrl::DoGetBestSize() const
+{
+    // What would be the best size for a wxSTC?
+    // Just give a reasonable minimum until something else can be figured out.
+    return wxSize(200,100);
+}
+
+

 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 
 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 11f590c9a47e392a6e2075454dee23bf7d730b82..6e626e3bef272310d862558d85eb17b73586f12b 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -168,6 +168,8 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif

+
+    SetBestFittingSize(size);

 }
 
 
 }
 
 


@@ -566,6 +568,14 @@ void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) {
 }
 
 
 }
 
 

+wxSize wxStyledTextCtrl::DoGetBestSize() const
+{
+    // What would be the best size for a wxSTC?
+    // Just give a reasonable minimum until something else can be figured out.
+    return wxSize(200,100);
+}
+
+

 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 
 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 2592301f637911e10843077b2392d1a3b1ac68ca..91148d3575abb9ea89f2a22bdae125315cceb2f0 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -246,6 +246,7 @@ private:
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     

+    virtual wxSize DoGetBestSize() const;

 
     // Turn notifications from Scintilla into events
     void NotifyChange();
 
     // Turn notifications from Scintilla into events
     void NotifyChange();