Small Tex2RTF fixes; wxMotif compile fixes (motif.inc, wxCheckListBox);

wxMSW wxWindow::IsShown fix


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

src/generic/gridg.cpp

@@ -222,7 +222,7 @@ bool wxGenericGrid::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
   m_hScrollBar = new wxScrollBar(this, wxGRID_HSCROLL, wxPoint(0, 0), wxSize(20, 100), wxHORIZONTAL);
   m_vScrollBar = new wxScrollBar(this, wxGRID_VSCROLL, wxPoint(0, 0), wxSize(100, 20), wxVERTICAL);
 
-  SetSize(-1, -1, size.x, size.y);
+//  SetSize(pos.x, pos.y, size.x, size.y);
 
   return TRUE;
 }

src/motif.inc

@@ -83,6 +83,7 @@ LIB_CPP_SRC=\
  motif/combobox.cpp \
  motif/cursor.cpp \
  motif/data.cpp \
+ motif/dataobj.cpp \
  motif/dc.cpp \
  motif/dcclient.cpp \
  motif/dcmemory.cpp \

src/msw/app.cpp

@@ -319,8 +319,6 @@ bool wxApp::RegisterWindowClasses()
 // Register the panel window class.
   WNDCLASS wndclass2;   // Structure used to register Windows class.
   memset(&wndclass2, 0, sizeof(WNDCLASS));   // start with NULL defaults
-  // Use CS_OWNDC to avoid messing about restoring the context
-  // for every graphic operation.
   wndclass2.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
   wndclass2.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass2.cbClsExtra    = 0;

src/msw/radiobox.cpp

@@ -792,6 +792,7 @@ void wxRadioBox::SetFocus(void)
 
 bool wxRadioBox::Show(bool show)
 {
+    m_isShown = show;
     int cshow;
     if (show)
         cshow = SW_SHOW;

src/msw/window.cpp

@@ -770,13 +770,14 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
 
 bool wxWindow::Show(bool show)
 {
+    m_isShown = show;
     HWND hWnd = (HWND) GetHWND();
     int cshow;
     if (show)
         cshow = SW_SHOW;
     else
         cshow = SW_HIDE;
-    ShowWindow(hWnd, (BOOL)cshow);
+    ShowWindow(hWnd, cshow);
     if (show)
     {
         BringWindowToTop(hWnd);
@@ -788,7 +789,11 @@ bool wxWindow::Show(bool show)
 
 bool wxWindow::IsShown(void) const
 {
-    return (::IsWindowVisible((HWND) GetHWND()) != 0);
+    // Can't rely on IsWindowVisible, since it will return FALSE
+    // if the parent is not visible.
+    return m_isShown;
+//    int ret = ::IsWindowVisible((HWND) GetHWND()) ;
+//    return (ret != 0);
 }
 
 int wxWindow::GetCharHeight(void) const