OGL fixes; documentation fixes; dialog editor updates

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

utils/nplugin/samples/simple/makefile.nt

@@ -43,7 +43,7 @@ $(PROGRAM).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\wx.lib $(PLUGINLIB) $(PROGRA
     -out:$(PROGRAM).dll   \
     -def:$(PROGRAM).def \
     $(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res $(WXDIR)\lib\wx.lib $(PLUGINLIB) \
-    $(guilibsdll) msvcrt.lib shell32.lib comctl32.lib ctl3d32.lib
+    $(guilibsdll) msvcrt.lib shell32.lib comctl32.lib ctl3d32.lib ole32.lib
 
 simple.obj:      simple.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

utils/nplugin/samples/simple/simple.cpp

@@ -32,7 +32,7 @@
 // Define a new application type
 class MyApp: public wxPluginApp
 { public:
-    virtual wxFrame *OnInit(void);
+    virtual bool OnInit(void);
     virtual wxPluginFrame* OnNewInstance(const wxPluginData& data);
 };
 
@@ -70,9 +70,9 @@ IMPLEMENT_APP(MyApp)
 
 // No app initialisation necessary, and for a plugin there is no
 // top frame.
-wxFrame *MyApp::OnInit(void)
+bool MyApp::OnInit(void)
 {
-    return NULL;
+    return TRUE;
 }
 
 // Called whenever a new plugin instance is called. We could check

utils/nplugin/src/npapp.cpp

@@ -121,6 +121,8 @@ jref      wxPluginApp::NPP_GetJavaClass(void)
 }
 */
 
+// This can't work now because we don't have a global app until wxEntry is called.
+// We'll put the wxEntry call in npshell.cpp instead.
 NPError   wxPluginApp::NPP_Initialize(void)
 {
     static int init = FALSE;

utils/nplugin/src/npshell.cpp

@@ -42,12 +42,16 @@ typedef struct _PluginInstance
 NPError NPP_Initialize(void)
 {
 //    MessageBox(NULL, "NPP_Initialize", "NPTest", MB_OK);
-
+/*
     wxPluginApp *app = wxGetPluginApp();
     if ( app )
         return app->NPP_Initialize();
     else
         return NPERR_NO_ERROR;
+*/
+    wxEntry((WXHINSTANCE) GetModuleHandle(NULL));
+
+    return NPERR_NO_ERROR;
 }