Changed wxSizer::GetSize() to DoGetSize() (and others)

  Added debug code because I dont know why buttons
   sometimes work and sometimes not.

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

diff --git a/include/wx/layout.h b/include/wx/layout.h
index f4418fd6fb4417216b8faf0263dd5b89dc2f0b28..f0affc67edd24e65256591531de8df6418b7f7d5 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -265,11 +265,9 @@ public:
 
     bool Create(wxWindowBase *parent, wxSizerBehaviour behav = wxSizerNone);
 
 
     bool Create(wxWindowBase *parent, wxSizerBehaviour behav = wxSizerNone);
 

-    virtual void GetSize(int *w, int *h) const;
-
-    virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
-
-    virtual void GetPosition(int *x, int *y) const;
+    virtual void DoGetSize(int *w, int *h) const;
+    virtual void DoGetClientSize(int *w, int *h) const { GetSize(w, h); }
+    virtual void DoGetPosition(int *x, int *y) const;

 
     void SizerSetSize(int x, int y, int w, int h) { SetSize(x, y, w, h); }
     void SizerMove(int x, int y) { Move(x, y); }
 
     void SizerSetSize(int x, int y, int w, int h) { SetSize(x, y, w, h); }
     void SizerMove(int x, int y) { Move(x, y); }

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 9a021d569b0fe4c112cab71b8457acc4062d7d95..441a1217c007e815e8e2136c129803581fcadccb 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -1342,13 +1342,13 @@ void wxSizer::DoSetSize(int x, int y, int w, int h, int WXUNUSED(flags))
     }
 }
 
     }
 }
 

-void wxSizer::GetSize(int *w, int *h) const
+void wxSizer::DoGetSize(int *w, int *h) const

 {
     *w = sizerWidth;
     *h = sizerHeight;
 }
 
 {
     *w = sizerWidth;
     *h = sizerHeight;
 }
 

-void wxSizer::GetPosition(int *x, int *y) const
+void wxSizer::DoGetPosition(int *x, int *y) const

 {
     *x = sizerX;
     *y = sizerY;
 {
     *x = sizerX;
     *y = sizerY;

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index a62f4797484538a356683b647c6e19d7fe0773de..0c40ccf0f4264ceea3221ac4c7d2283c189cb8f7 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -161,16 +161,19 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
 
 void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
 {

+    printf( "yes.\n" );

     EndModal( wxID_YES );
 }
 
 void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
 {
     EndModal( wxID_YES );
 }
 
 void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
 {

+    printf( "no.\n" );

     EndModal( wxID_NO );
 }
 
 void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     EndModal( wxID_NO );
 }
 
 void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {

+    printf( "cancel message.\n" );

     /* Allow cancellation via ESC/Close button except if
        only YES and NO are specified. */
     if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
     /* Allow cancellation via ESC/Close button except if
        only YES and NO are specified. */
     if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 254056d7700879a6f1a07246e39d71a916fc77d3..62e357c733284bc151a8a3e81a4a6018314b0648 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -41,11 +41,14 @@ 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;

-  
+    
+    printf( "clicked: %s.\n", button->GetLabel().c_str() );
+    

     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);

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index c047ebabdb9be6723c0c0eea8aa61fbda77be125..43e102b9aac3d3d05ea9ae254c563eba4e4e6a16 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -290,14 +290,18 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 
 void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {
 
 void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {

-    if ( Validate() && TransferDataFromWindow())
+    printf( "OnOK 1.\n" );
+    if (Validate() && TransferDataFromWindow())

     {
     {

+        printf( "OnOK 2.\n" );

         if (IsModal())
         {
         if (IsModal())
         {

+        printf( "OnOK: modal.\n" );

             EndModal(wxID_OK);
         }
         else
         {
             EndModal(wxID_OK);
         }
         else
         {

+        printf( "OnOK: non-modal.\n" );

             SetReturnCode(wxID_OK);
             this->Show(FALSE);
         }
             SetReturnCode(wxID_OK);
             this->Show(FALSE);
         }

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 254056d7700879a6f1a07246e39d71a916fc77d3..62e357c733284bc151a8a3e81a4a6018314b0648 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -41,11 +41,14 @@ 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;

-  
+    
+    printf( "clicked: %s.\n", button->GetLabel().c_str() );
+    

     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);

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index c047ebabdb9be6723c0c0eea8aa61fbda77be125..43e102b9aac3d3d05ea9ae254c563eba4e4e6a16 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -290,14 +290,18 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 
 void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {
 
 void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {

-    if ( Validate() && TransferDataFromWindow())
+    printf( "OnOK 1.\n" );
+    if (Validate() && TransferDataFromWindow())

     {
     {

+        printf( "OnOK 2.\n" );

         if (IsModal())
         {
         if (IsModal())
         {

+        printf( "OnOK: modal.\n" );

             EndModal(wxID_OK);
         }
         else
         {
             EndModal(wxID_OK);
         }
         else
         {

+        printf( "OnOK: non-modal.\n" );

             SetReturnCode(wxID_OK);
             this->Show(FALSE);
         }
             SetReturnCode(wxID_OK);
             this->Show(FALSE);
         }