fixed static members

[wxWidgets.git] / src / gtk1 / button.cpp

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 254056d7700879a6f1a07246e39d71a916fc77d3..ad9b36f8daa54dab65c79a1256feaccd51e9b156 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -41,11 +41,12 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
 
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+       wxapp_install_idle_handler();

 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;

-  
+    

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
     button->GetEventHandler()->ProcessEvent(event);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
     button->GetEventHandler()->ProcessEvent(event);


@@ -78,7 +79,9 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 
     PreCreation( parent, id, pos, newSize, style, name );
   
 
     PreCreation( parent, id, pos, newSize, style, name );
   

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     SetValidator( validator );

+#endif // wxUSE_VALIDATORS

 
     m_widget = gtk_button_new_with_label( "" );
     
 
     m_widget = gtk_button_new_with_label( "" );
     


@@ -117,6 +120,12 @@ void wxButton::SetDefault(void)
     SetSize( m_x, m_y, m_width, m_height );
 }
 
     SetSize( m_x, m_y, m_width, m_height );
 }
 

+/* static */
+wxSize wxButton::GetDefaultSize()
+{
+    return wxSize(80,26);
+}
+

 void wxButton::SetLabel( const wxString &label )
 {
     wxCHECK_RET( m_widget != NULL, _T("invalid button") );
 void wxButton::SetLabel( const wxString &label )
 {
     wxCHECK_RET( m_widget != NULL, _T("invalid button") );