Minor changes

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 05d9001f46bff404709793e74c71067655ef07b1..cedfe8b6de616e0aa880a32d4f29befa9460c120 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -657,3 +657,27 @@ samples/png/*.ico
 samples/png/*.txt
 samples/png/*.png
 
+samples/image/*.cpp
+samples/image/*.h
+samples/image/makefile*
+samples/image/*.rc
+samples/image/*.def
+samples/image/*.bmp
+samples/image/*.xpm
+samples/image/*.xbm
+samples/image/*.png
+samples/image/*.ico
+samples/image/*.txt
+
+samples/thread/*.cpp
+samples/thread/*.h
+samples/thread/makefile*
+samples/thread/*.rc
+samples/thread/*.def
+samples/thread/*.bmp
+samples/thread/*.xpm
+samples/thread/*.xbm
+samples/thread/*.png
+samples/thread/*.ico
+samples/thread/*.txt
+

diff --git a/docs/symbols.txt b/docs/symbols.txt
index bee97d122b676476cdaca3ff2ebf1b17499cdb40..e0ec59f6484422b90a114527b8134927d29995d4 100644 (file)
--- a/docs/symbols.txt
+++ b/docs/symbols.txt
@@ -56,6 +56,6 @@ __XLC__         ?? compiler
 wxWindows modes:
 ----------------
 
-__WXDEBUG__       usage: #ifdef __DEBUG__ (=> debug mode, else => release)
+__WXDEBUG__       usage: #ifdef __WXDEBUG__ (=> debug mode, else => release)
 WXDEBUG         usage: #if DEBUG (0: release, 1: minimal debug code, ...)
 

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index c92ac4ba7832e5258ce8a8fb3da9203efa55e5a7..8c5da8f12fff61032e368a4a6e0fce8a72023342 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -60,6 +60,8 @@ public:
   void GetSize(int *width, int *height) const ;
   void GetPosition(int *x, int *y) const ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void ClientToScreen(int *x, int *y) const;
+  void ScreenToClient(int *x, int *y) const;
 
   virtual bool OnClose();
 

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 394e658f5909a3d30722c457e6455bb9e69197d3..33dfa21c1d731431fa7c6a4626c9b2ef99ecfac0 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -60,6 +60,8 @@ public:
   void GetSize(int *width, int *height) const ;
   void GetPosition(int *x, int *y) const ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void ClientToScreen(int *x, int *y) const;
+  void ScreenToClient(int *x, int *y) const;
 
   virtual bool OnClose(void);
 

diff --git a/include/wx/stubs/frame.h b/include/wx/stubs/frame.h
index 705cc5cf24774334e4843d628aadb95088f7cfeb..fcd8689e5627a941ba5bc121c8e9021aea605df7 100644 (file)
--- a/include/wx/stubs/frame.h
+++ b/include/wx/stubs/frame.h
@@ -60,6 +60,8 @@ public:
   void GetSize(int *width, int *height) const ;
   void GetPosition(int *x, int *y) const ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void ClientToScreen(int *x, int *y) const;
+  void ScreenToClient(int *x, int *y) const;
 
   virtual bool OnClose();
 

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 6950dc80ccf1250149af7f01ee4c610dcd67dc26..704c124ba98aa34affdc43619a12ff99bfc31475 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -118,7 +118,7 @@ void wxObject::operator delete (void * buf)
 
 // VC++ 6.0
 #if _MSC_VER >= 1200
-void operator wxObject::delete(void* pData, char* /* fileName */, int /* lineNum */)
+void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
  ::operator delete(pData);
 }

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index a14a082387d8bdad1765258a547f9f1a8aab9474..7da74055f5c58e23358f79885b06c6da4b847937 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -134,6 +134,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        {
                if ( !m_includeList.Member(val) )
                {
+            m_validatorWindow->SetFocus();
                        char buf[512];
                        sprintf(buf, _("%s is invalid."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
@@ -144,6 +145,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        {
                if ( m_excludeList.Member(val) )
                {
+            m_validatorWindow->SetFocus();
                        char buf[512];
                        sprintf(buf, _("%s is invalid."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
@@ -152,6 +154,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        }
        if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
        {
+            m_validatorWindow->SetFocus();
                        char buf[512];
                        sprintf(buf, _("%s should only contain ASCII characters."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
@@ -159,6 +162,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        }
        if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
        {
+            m_validatorWindow->SetFocus();
                        char buf[512];
                        sprintf(buf, _("%s should only contain alphabetic characters."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
@@ -166,6 +170,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        }
        if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
        {
+            m_validatorWindow->SetFocus();
                        char buf[512];
                        sprintf(buf, _("%s should only contain alphabetic or numeric characters."), (const char *)val);
                        wxMessageBox(buf,_("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
@@ -174,6 +179,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
        if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
 
        {
+            m_validatorWindow->SetFocus();
                        char buf[512];
                        sprintf(buf, _("%s should be numeric."), (const char *)val);
                        wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index c294be1df8444a9c5d87eb91af294d1d3f91bab6..1de5a6a5cdb9f32e4530c83b8a816688fcb3cf94 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -886,6 +886,30 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
+void wxFrame::ScreenToClient(int *x, int *y) const
+{
+    wxWindow::ScreenToClient(x, y);
+
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    wxPoint pt(GetClientAreaOrigin());
+    *x -= pt.x;
+    *y -= pt.y;
+}
+
+void wxFrame::ClientToScreen(int *x, int *y) const
+{
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    wxPoint pt1(GetClientAreaOrigin());
+    *x += pt1.x;
+    *y += pt1.y;
+
+    wxWindow::ClientToScreen(x, y);
+}
+
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 7f7b49f2944d76a5f1dc7ece6250bfbaa8353b9b..b4dfeb31e9bf4cfd876375013c92217c0d58184f 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -972,6 +972,30 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
+void wxFrame::ScreenToClient(int *x, int *y) const
+{
+    wxWindow::ScreenToClient(x, y);
+
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    wxPoint pt(GetClientAreaOrigin());
+    *x -= pt.x;
+    *y -= pt.y;
+}
+
+void wxFrame::ClientToScreen(int *x, int *y) const
+{
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    wxPoint pt1(GetClientAreaOrigin());
+    *x += pt1.x;
+    *y += pt1.y;
+
+    wxWindow::ClientToScreen(x, y);
+}
+
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 9c3088c8bdf3abd3aa2bab48ac6068ed2ffd3f8c..a8b9eb10ccc9078765dcaba0171d2e1065ee7de9 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -227,7 +227,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 #if defined(__WIN95__)
        else if (str == "MSCTLS_UPDOWN32")
        {
-               win == new wxSpinButton;
+               win = new wxSpinButton;
        }
 #endif
        else if (str == "MSCTLS_TRACKBAR32")

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index c11fc3d39b5c038e8f36dac130193c02cdaee573..8994821ca3e1d005ec642f5e7614793a39be651a 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -618,19 +618,8 @@ void wxWindow::ScreenToClient(int *x, int *y) const
     POINT pt;
     pt.x = *x;
     pt.y = *y;
-    ::ScreenToClient(hWnd, &pt);
 
-    /*
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    if (GetParent())
-    {
-    wxPoint pt1(GetParent()->GetClientAreaOrigin());
-    pt.x -= pt1.x;
-    pt.y -= pt1.y;
-    }
-    */
+    ::ScreenToClient(hWnd, &pt);
 
     *x = pt.x;
     *y = pt.y;
@@ -643,18 +632,6 @@ void wxWindow::ClientToScreen(int *x, int *y) const
     pt.x = *x;
     pt.y = *y;
 
-    /*
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    if (GetParent())
-    {
-    wxPoint pt1(GetParent()->GetClientAreaOrigin());
-    pt.x += pt1.x;
-    pt.y += pt1.y;
-    }
-    */
-
     ::ClientToScreen(hWnd, &pt);
 
     *x = pt.x;

diff --git a/src/stubs/frame.cpp b/src/stubs/frame.cpp
index 591b59e4f4b771a940e952b3cff14edbbe329e14..8d9ed813adf0b65fb638e447f0af062a484f1a5b 100644 (file)
--- a/src/stubs/frame.cpp
+++ b/src/stubs/frame.cpp
@@ -481,6 +481,30 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
+void wxFrame::ScreenToClient(int *x, int *y) const
+{
+    wxWindow::ScreenToClient(x, y);
+
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    wxPoint pt(GetClientAreaOrigin());
+    *x -= pt.x;
+    *y -= pt.y;
+}
+
+void wxFrame::ClientToScreen(int *x, int *y) const
+{
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    wxPoint pt1(GetClientAreaOrigin());
+    *x += pt1.x;
+    *y += pt1.y;
+
+    wxWindow::ClientToScreen(x, y);
+}
+
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,